diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-03-17 03:25:41 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-03-17 03:36:09 -0400 |
| commit | 1cbdfede76c924d4f972e322335ee9f674ff90d8 (patch) | |
| tree | 62d5b464f2f26c5ed3d26df5e6a883afb149c969 | |
| parent | a732d49b0ddeeab63afcd2e5281598949aaaf533 (diff) | |
| download | guix-1cbdfede76c924d4f972e322335ee9f674ff90d8.tar guix-1cbdfede76c924d4f972e322335ee9f674ff90d8.tar.gz | |
gnu: libsndfile: Ungraft.
* gnu/packages/pulseaudio.scm (libsndfile)[replacement]: Remove field.
[source]: Add patch from former replacement.
(libsndfile/fixed): Remove variable.
| -rw-r--r-- | gnu/packages/pulseaudio.scm | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index f23ef9eca1..fee3c39043 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -47,7 +47,6 @@ (define-public libsndfile (package (name "libsndfile") - (replacement libsndfile/fixed) (version "1.0.28") (source (origin (method url-fetch) @@ -55,7 +54,8 @@ version ".tar.gz")) (patches (search-patches "libsndfile-armhf-type-checks.patch" "libsndfile-CVE-2017-8361-8363-8365.patch" - "libsndfile-CVE-2017-8362.patch")) + "libsndfile-CVE-2017-8362.patch" + "libsndfile-CVE-2017-12562.patch")) (sha256 (base32 "1afzm7jx34jhqn32clc5xghyjglccam2728yxlx37yj2y0lkkwqz")))) @@ -81,15 +81,6 @@ SPARC. Hopefully the design of the library will also make it easy to extend for reading and writing new sound file formats.") (license l:gpl2+))) -(define libsndfile/fixed - (package - (inherit libsndfile) - (source (origin - (inherit (package-source libsndfile)) - (patches (append - (origin-patches (package-source libsndfile)) - (search-patches "libsndfile-CVE-2017-12562.patch"))))))) - (define-public libsamplerate (package (name "libsamplerate") ; aka. Secret Rabbit Code (SRC) |