From cec2c24d85d8a7239ee6557353ef49318fc5efb3 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 19 Jan 2005 21:48:45 +0000
Subject: [PATCH] added libvorbis libogg and flac

svn path=/nixpkgs/trunk/; revision=2063
---
 pkgs/applications/audio/flac/default.nix         | 11 +++++++++++
 pkgs/development/libraries/libogg/default.nix    |  9 +++++++++
 pkgs/development/libraries/libvorbis/default.nix | 11 +++++++++++
 pkgs/system/all-packages-generic.nix             | 13 +++++++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 pkgs/applications/audio/flac/default.nix
 create mode 100644 pkgs/development/libraries/libogg/default.nix
 create mode 100644 pkgs/development/libraries/libvorbis/default.nix

diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
new file mode 100644
index 000000000000..707b44be8a6f
--- /dev/null
+++ b/pkgs/applications/audio/flac/default.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl, libogg}:
+
+stdenv.mkDerivation {
+  name = "flac-1.1.1";
+  src = fetchurl {
+    url = http://mesh.dl.sourceforge.net/sourceforge/flac/flac-1.1.1.tar.gz ;
+    md5 = "c6ccddccf8ad344065698047c2fc7280" ;
+  };
+
+  buildInputs = [libogg] ;
+}
diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
new file mode 100644
index 000000000000..52b2d48f4a61
--- /dev/null
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -0,0 +1,9 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "libogg-1.1.2";
+  src = fetchurl {
+    url = http://downloads.xiph.org/releases/ogg/libogg-1.1.2.tar.gz ;
+    md5 = "4d82996517bf33bb912c97e9d0b635c4" ;
+  };
+}
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
new file mode 100644
index 000000000000..b5eeb18ffeba
--- /dev/null
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl, libogg}:
+
+stdenv.mkDerivation {
+  name = "libvorbis-1.1.0";
+  src = fetchurl {
+    url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.1.0.tar.gz ;
+    md5 = "bb764aeabde613d1a424a29b1f15e7e6" ;
+  };
+
+   buildInputs = [libogg];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 656b5c20435c..b9187fc5c4d2 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -529,6 +529,14 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  libogg = (import ../development/libraries/libogg) {
+    inherit fetchurl stdenv;
+  };
+
+  libvorbis = (import ../development/libraries/libvorbis) {
+    inherit fetchurl stdenv libogg;
+  };
+
   libxml2 = (import ../development/libraries/libxml2) {
     inherit fetchurl stdenv zlib python;
   };
@@ -861,6 +869,11 @@ rec {
   cdparanoiaIII = (import ../applications/audio/cdparanoia) {
     inherit fetchurl stdenv;
   };
+  
+  flac = (import ../applications/audio/flac) {
+    inherit fetchurl stdenv libogg;
+  };
+
 
   MPlayer = (import ../applications/video/MPlayer) {
     inherit fetchurl stdenv freetype x11 zlib;