diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-04-02 15:36:14 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-04-02 15:36:14 +0000 |
| commit | 8776ba127c0b63cba6a5b8015154909e5aa3167d (patch) | |
| tree | d3ef86b7c17cec48e924a7f0d5d2735822168e3b /pkgs/development/libraries/libdvdread | |
| parent | de759967c88370fcd8e7f12832a63bd2ee7b8f9e (diff) | |
| download | nixlib-8776ba127c0b63cba6a5b8015154909e5aa3167d.tar nixlib-8776ba127c0b63cba6a5b8015154909e5aa3167d.tar.gz nixlib-8776ba127c0b63cba6a5b8015154909e5aa3167d.tar.bz2 nixlib-8776ba127c0b63cba6a5b8015154909e5aa3167d.tar.lz nixlib-8776ba127c0b63cba6a5b8015154909e5aa3167d.tar.xz nixlib-8776ba127c0b63cba6a5b8015154909e5aa3167d.tar.zst nixlib-8776ba127c0b63cba6a5b8015154909e5aa3167d.zip | |
* Updated some more packages. However, bittorrent and vlc don't work
right now because wxGTK is broken (it depends on internal symbols in GTK which where made private in GTK 2.4). svn path=/nixpkgs/trunk/; revision=907
Diffstat (limited to 'pkgs/development/libraries/libdvdread')
| -rw-r--r-- | pkgs/development/libraries/libdvdread/builder.sh | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/libdvdread/default.nix | 3 |
2 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/development/libraries/libdvdread/builder.sh b/pkgs/development/libraries/libdvdread/builder.sh index 1581116ce53f..9173ce1b205e 100644 --- a/pkgs/development/libraries/libdvdread/builder.sh +++ b/pkgs/development/libraries/libdvdread/builder.sh @@ -1,9 +1,5 @@ -buildinputs="$libdvdcss" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfj $src || exit 1 -cd libdvdread-* || exit 1 -./configure --prefix=$out --with-libdvdcss="$libdvdcss" || exit 1 -make || exit 1 -make install || exit 1 -strip -S $out/lib/*.a || exit 1 +configureFlags="--with-libdvdcss=$libdvdcss" + +genericBuild diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 926180384d1e..de6fc15368ca 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -9,5 +9,6 @@ stdenv.mkDerivation { url = http://www.videolan.org/pub/videolan/vlc/0.6.2/contrib/libdvdread-20030812.tar.bz2; md5 = "9d58beac7c2dfb98d00f4ed0ea3d7274"; }; - libdvdcss = libdvdcss; + buildInputs = libdvdcss; + inherit libdvdcss; } |