diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-09-24 19:26:34 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-09-24 20:27:58 +0200 |
commit | 4f27a3337160da33c5fbc24e97c2428d31a50c90 (patch) | |
tree | fd7f2f0f25a070c078519a3d61b2558bcd45f00a /gnu/packages | |
parent | ffcff272728e750c62acbbf8322c2ad35d69ad81 (diff) | |
download | guix-4f27a3337160da33c5fbc24e97c2428d31a50c90.tar guix-4f27a3337160da33c5fbc24e97c2428d31a50c90.tar.gz |
gnu: Fix syntax errors introduced by dc1d3cdef70f0e3c047c229c2a0e56.
* gnu/packages/mp3.scm (libmad)[arguments]: Adjust syntax and indentation.
* gnu/packages/rdf.scm (lrdf)[arguments]: Adjust phase order.
* gnu/packages/audio.scm (vamp)[arguments]: Remove stray character.
(zita-convolver)[arguments]: Adjust parsens and indentation.
(clalsadrv)[arguments]: Remove stray 'modify-phases'.
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/audio.scm | 24 | ||||
-rw-r--r-- | gnu/packages/mp3.scm | 9 | ||||
-rw-r--r-- | gnu/packages/rdf.scm | 8 |
3 files changed, 20 insertions, 21 deletions
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index c295e41450..e06c62a0e8 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -629,9 +629,9 @@ language and software synthesizer.") (lambda _ (symlink "libclalsadrv.so" (string-append (assoc-ref %outputs "out") - "/lib/libclalsadrv.so.2"))) - ;; no configure script - (modify-phases %standard-phases (delete 'configure)))))) + "/lib/libclalsadrv.so.2")))) + ;; no configure script + (delete 'configure)))) (inputs `(("alsa-lib" ,alsa-lib) ("fftw" ,fftw))) @@ -2144,7 +2144,7 @@ disks as various audio file formats.") (let ((out (assoc-ref outputs "out"))) (list (string-append out "/lib/libvamp-sdk.la") (string-append out "/lib/libvamp-hostsdk.la")))) - #t)s)))) + #t))))) (inputs `(("libsndfile" ,libsndfile))) (native-inputs @@ -2589,14 +2589,14 @@ result.") (substitute* "libs/Makefile" (("ldconfig") "true") (("^LIBDIR =.*") "LIBDIR = lib\n")) - (chdir "libs") #t) - (add-after 'install 'install-symlink - (lambda _ - (symlink "libzita-convolver.so" - (string-append (assoc-ref %outputs "out") - "/lib/libzita-convolver.so.3")))) - ;; no configure script - (delete 'configure))))) + (chdir "libs") #t)) + (add-after 'install 'install-symlink + (lambda _ + (symlink "libzita-convolver.so" + (string-append (assoc-ref %outputs "out") + "/lib/libzita-convolver.so.3")))) + ;; no configure script + (delete 'configure)))) (inputs `(("fftwf" ,fftwf))) (home-page "http://kokkinizita.linuxaudio.org") (synopsis "Fast, partitioned convolution engine library") diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 6412dce16d..7c8f32175d 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -68,11 +68,10 @@ `(#:phases (modify-phases %standard-phases (add-before 'configure 'remove-unsupported-gcc-flags - (lambda _ - ;; remove option that is not supported by gcc any more - (substitute* "configure" ((" -fforce-mem") "")) - #t) - %standard-phases)))) + (lambda _ + ;; remove option that is not supported by gcc any more + (substitute* "configure" ((" -fforce-mem") "")) + #t))))) (synopsis "MPEG audio decoder") (description "MAD (MPEG Audio Decoder) supports MPEG-1 and the MPEG-2 extension to diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index fbd8a45ba0..2ccfc2cec4 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -129,9 +129,6 @@ Java Lucene text search engine API to C++.") (arguments '(#:phases (modify-phases %standard-phases - (add-after 'remove-out-of-tree-references 'autoreconf - (lambda _ - (zero? (system* "autoreconf" "-vfi")))) (add-after 'unpack 'remove-out-of-tree-references (lambda _ ;; remove symlinks to files in /usr/ @@ -146,7 +143,10 @@ Java Lucene text search engine API to C++.") (substitute* "examples/Makefile.am" (("instances_test remove_test") "instances_test") (("\\$\\(TESTS\\) remove_test") "$(TESTS)")) - #t))))) + #t)) + (add-after 'remove-out-of-tree-references 'autoreconf + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) (inputs `(("raptor" ,raptor2) ("cyrus-sasl" ,cyrus-sasl) |