From ca59c577d04df963a6e09d17e089a1d3c34da4e7 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Thu, 12 Jun 2014 18:53:21 -0400
Subject: libogg, libvorbis: update to 1.3.2, 1.3.4

---
 pkgs/development/libraries/libvorbis/default.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'pkgs/development/libraries/libvorbis')

diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index b1277b87e6a7a..82c218d67b396 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -1,17 +1,24 @@
-{ stdenv, fetchurl, libogg, xz }:
+{ stdenv, fetchurl, libogg }:
 
-stdenv.mkDerivation rec {
-  name = "libvorbis-1.3.3";
+let
+  name = "libvorbis-1.3.4";
+in
+stdenv.mkDerivation {
+  inherit name;
   
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz";
-    sha256 = "1gby6hapz9njx4l9g0pndyk4q83z5fgrgc30mfwfgx7bllspsk43";
+    sha256 = "0wpk87jnhngcl3nc5i39flkycx1sjzilx8jjx4zc4p8r55ylj19g";
   };
 
-  nativeBuildInputs = [ xz ];
   propagatedBuildInputs = [ libogg ];
 
-  meta = {
+  doCheck = true;
+
+  meta = with stdenv.lib; {
     homepage = http://xiph.org/vorbis/;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.emery ];
+    platforms = platforms.all;
   };
 }
-- 
cgit 1.4.1


From c5e00799624e3dfa4f1dca727cbf81353bcfc091 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Sun, 22 Jun 2014 12:39:07 +0200
Subject: libvorbis: use pkgconfig instead of guessing paths. Closes #3014

---
 pkgs/development/libraries/libvorbis/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'pkgs/development/libraries/libvorbis')

diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index 82c218d67b396..0dd99605b3366 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libogg }:
+{ stdenv, fetchurl, libogg, pkgconfig }:
 
 let
   name = "libvorbis-1.3.4";
@@ -11,6 +11,8 @@ stdenv.mkDerivation {
     sha256 = "0wpk87jnhngcl3nc5i39flkycx1sjzilx8jjx4zc4p8r55ylj19g";
   };
 
+  buildInputs = [ pkgconfig ];
+
   propagatedBuildInputs = [ libogg ];
 
   doCheck = true;
-- 
cgit 1.4.1