Merge branch 'master' into stdenv-updates.

Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix

1 files changed, 18 insertions, 0 deletions

diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
new file mode 100644
index 000000000000..d4c90ee33fbe
--- /dev/null
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, fixedPoint ? false }:
+
+stdenv.mkDerivation rec {
+  name = "libopus-1.0.1";
+  
+  src = fetchurl {
+    url = "http://downloads.xiph.org/releases/opus/opus-1.0.1.tar.gz";
+    sha256 = "1vs133z6c03xi1a7b8bkqxlb6ipwchawwb52z1lgvh1amwy5ryl0";
+  };
+
+  configureFlags = stdenv.lib.optionalString fixedPoint "--enable-fixed-point";
+
+  meta = {
+    description = "Open, royalty-free, highly versatile audio codec";
+    license = "BSD";
+    homepage = http://www.opus-codec.org/;
+  };
+}