summary refs log tree commit diff
path: root/pkgs/applications/audio/opusfile
diff options
context:
space:
mode:
authorMichal Rus <m@michalrus.com>2016-09-13 07:00:39 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2016-09-13 07:00:39 +0200
commit6846b22bb49d07574e6da3273c38305a765e136f (patch)
treefea2421b414c414cc3e3850678f0a7827b4ef8ad /pkgs/applications/audio/opusfile
parent9b26cb92e3c9a6f9c28e68d194c3f015c9eabcd4 (diff)
downloadnixpkgs-6846b22bb49d07574e6da3273c38305a765e136f.tar
nixpkgs-6846b22bb49d07574e6da3273c38305a765e136f.tar.gz
nixpkgs-6846b22bb49d07574e6da3273c38305a765e136f.tar.bz2
nixpkgs-6846b22bb49d07574e6da3273c38305a765e136f.tar.lz
nixpkgs-6846b22bb49d07574e6da3273c38305a765e136f.tar.xz
nixpkgs-6846b22bb49d07574e6da3273c38305a765e136f.tar.zst
nixpkgs-6846b22bb49d07574e6da3273c38305a765e136f.zip
squishyball: init at 19580 (#18354)
Diffstat (limited to 'pkgs/applications/audio/opusfile')
-rw-r--r--pkgs/applications/audio/opusfile/default.nix4
-rw-r--r--pkgs/applications/audio/opusfile/include-multistream.patch12
2 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix
index b55ea30bae0..4937d09e532 100644
--- a/pkgs/applications/audio/opusfile/default.nix
+++ b/pkgs/applications/audio/opusfile/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openssl libogg libopus ];
+  buildInputs = [ openssl libogg ];
+  propagatedBuildInputs = [ libopus ];
+  patches = [ ./include-multistream.patch ];
 
   meta = {
     description = "High-level API for decoding and seeking in .opus files";
diff --git a/pkgs/applications/audio/opusfile/include-multistream.patch b/pkgs/applications/audio/opusfile/include-multistream.patch
new file mode 100644
index 00000000000..7c6dd847596
--- /dev/null
+++ b/pkgs/applications/audio/opusfile/include-multistream.patch
@@ -0,0 +1,12 @@
+diff -Naur a/include/opusfile.h b/include/opusfile.h
+--- a/include/opusfile.h	2014-04-29 19:07:09.000000000 +0200
++++ b/include/opusfile.h	2016-09-05 17:50:15.147553798 +0200
+@@ -107,7 +107,7 @@
+ # include <stdarg.h>
+ # include <stdio.h>
+ # include <ogg/ogg.h>
+-# include <opus_multistream.h>
++# include <opus/opus_multistream.h>
+ 
+ /**@cond PRIVATE*/
+