about summary refs log tree commit diff
path: root/pkgs/development/libraries/libdvdread
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2006-06-29 12:41:25 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2006-06-29 12:41:25 +0000
commitd97fa85adf35642c6119123d4f8c1919ea2cbd1f (patch)
treea3c0e3a67fedf365a0bd2002720801bcd42ac84b /pkgs/development/libraries/libdvdread
parenta96763545d29ad4b97209566034c817f3e848c0c (diff)
downloadnixlib-d97fa85adf35642c6119123d4f8c1919ea2cbd1f.tar
nixlib-d97fa85adf35642c6119123d4f8c1919ea2cbd1f.tar.gz
nixlib-d97fa85adf35642c6119123d4f8c1919ea2cbd1f.tar.bz2
nixlib-d97fa85adf35642c6119123d4f8c1919ea2cbd1f.tar.lz
nixlib-d97fa85adf35642c6119123d4f8c1919ea2cbd1f.tar.xz
nixlib-d97fa85adf35642c6119123d4f8c1919ea2cbd1f.tar.zst
nixlib-d97fa85adf35642c6119123d4f8c1919ea2cbd1f.zip
* Some VLC-related updates.
* Variability :-)  Provide both Autoconf 2.59 and 2.60 (the former
  being the default for now).

svn path=/nixpkgs/trunk/; revision=5539
Diffstat (limited to 'pkgs/development/libraries/libdvdread')
-rw-r--r--pkgs/development/libraries/libdvdread/builder.sh5
-rw-r--r--pkgs/development/libraries/libdvdread/default.nix11
2 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/development/libraries/libdvdread/builder.sh b/pkgs/development/libraries/libdvdread/builder.sh
deleted file mode 100644
index 9b655cc0319a..000000000000
--- a/pkgs/development/libraries/libdvdread/builder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-source $stdenv/setup
-
-configureFlags="--with-libdvdcss=$libdvdcss"
-
-genericBuild
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index 674db2480e2e..fd0eee12ae40 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -1,14 +1,11 @@
 {stdenv, fetchurl, libdvdcss}:
 
-assert libdvdcss != null;
-
 stdenv.mkDerivation {
-  name = "libdvdread-20030812";
-  builder = ./builder.sh;
+  name = "libdvdread-0.9.6";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libdvdread-20030812.tar.bz2;
-    md5 = "9d58beac7c2dfb98d00f4ed0ea3d7274";
+    url = http://www.dtek.chalmers.se/groups/dvd/dist/libdvdread-0.9.6.tar.gz;
+    md5 = "329401b84ad0b00aaccaad58f2fc393c";
   };
-  buildInputs = libdvdcss;
+  configureFlags = "--with-libdvdcss=${libdvdcss}";
   inherit libdvdcss;
 }