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 | |
parent | de759967c88370fcd8e7f12832a63bd2ee7b8f9e (diff) |
* 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')
-rw-r--r-- | pkgs/development/libraries/a52dec/builder.sh | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/a52dec/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/libdvdcss/builder.sh | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/libdvdcss/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/libdvdplay/builder.sh | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/libdvdplay/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libdvdread/builder.sh | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/libdvdread/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/libmad/builder.sh | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/libmad/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/mpeg2dec/builder.sh | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/mpeg2dec/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/wxGTK/builder.sh | 13 | ||||
-rw-r--r-- | pkgs/development/libraries/wxGTK/default.nix | 14 |
14 files changed, 31 insertions, 82 deletions
diff --git a/pkgs/development/libraries/a52dec/builder.sh b/pkgs/development/libraries/a52dec/builder.sh deleted file mode 100644 index 1899153fa34be..0000000000000 --- a/pkgs/development/libraries/a52dec/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -. $stdenv/setup || exit 1 - -tar xvfz $src || exit 1 -cd a52dec-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 -strip -S $out/lib/*.a || exit 1 diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix index 20692fafb26af..4a75e11ec304f 100644 --- a/pkgs/development/libraries/a52dec/default.nix +++ b/pkgs/development/libraries/a52dec/default.nix @@ -1,6 +1,7 @@ -{stdenv, fetchurl}: stdenv.mkDerivation { +{stdenv, fetchurl}: + +stdenv.mkDerivation { name = "a52dec-0.7.4"; - builder = ./builder.sh; src = fetchurl { url = http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz; md5 = "caa9f5bc44232dc8aeea773fea56be80"; diff --git a/pkgs/development/libraries/libdvdcss/builder.sh b/pkgs/development/libraries/libdvdcss/builder.sh deleted file mode 100644 index c7bd41840bb1a..0000000000000 --- a/pkgs/development/libraries/libdvdcss/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -. $stdenv/setup || exit 1 - -tar xvfz $src || exit 1 -cd libdvdcss-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 -strip -S $out/lib/*.a || exit 1 diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index fe51ca0bb1f3d..c263447296429 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -1,6 +1,7 @@ -{stdenv, fetchurl}: stdenv.mkDerivation { +{stdenv, fetchurl}: + +stdenv.mkDerivation { name = "libdvdcss-1.2.8"; - builder = ./builder.sh; src = fetchurl { url = http://www.videolan.org/pub/videolan/vlc/0.6.2/contrib/libdvdcss-1.2.8.tar.gz; md5 = "e35e4240b6ca0b66a0218065dffe6adb"; diff --git a/pkgs/development/libraries/libdvdplay/builder.sh b/pkgs/development/libraries/libdvdplay/builder.sh deleted file mode 100644 index 686288592b3cd..0000000000000 --- a/pkgs/development/libraries/libdvdplay/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -buildinputs="$libdvdread" -. $stdenv/setup || exit 1 - -tar xvfj $src || exit 1 -cd libdvdplay-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 -strip -S $out/lib/*.a || exit 1 diff --git a/pkgs/development/libraries/libdvdplay/default.nix b/pkgs/development/libraries/libdvdplay/default.nix index 820d9df2f8a4b..09a7f785be323 100644 --- a/pkgs/development/libraries/libdvdplay/default.nix +++ b/pkgs/development/libraries/libdvdplay/default.nix @@ -4,10 +4,10 @@ assert libdvdread != null; stdenv.mkDerivation { name = "libdvdplay-1.0.1"; - builder = ./builder.sh; src = fetchurl { url = http://www.videolan.org/pub/libdvdplay/1.0.1/libdvdplay-1.0.1.tar.bz2; md5 = "602bca4ef78d79aa87e5e8920d958a78"; }; - libdvdread = libdvdread; + buildInputs = [libdvdread]; + inherit libdvdread; } diff --git a/pkgs/development/libraries/libdvdread/builder.sh b/pkgs/development/libraries/libdvdread/builder.sh index 1581116ce53ff..9173ce1b205e1 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 926180384d1ef..de6fc15368ca4 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; } diff --git a/pkgs/development/libraries/libmad/builder.sh b/pkgs/development/libraries/libmad/builder.sh deleted file mode 100644 index b6a916f74b642..0000000000000 --- a/pkgs/development/libraries/libmad/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -. $stdenv/setup || exit 1 - -tar xvfz $src || exit 1 -cd libmad-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 -strip -S $out/lib/*.a || exit 1 diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index a7441fbe6f223..7e5a93f229ac4 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -1,6 +1,7 @@ -{stdenv, fetchurl}: stdenv.mkDerivation { +{stdenv, fetchurl}: + +stdenv.mkDerivation { name = "libmad-0.15.0b"; - builder = ./builder.sh; src = fetchurl { url = http://heanet.dl.sourceforge.net/sourceforge/mad/libmad-0.15.0b.tar.gz; md5 = "2e4487cdf922a6da2546bad74f643205"; diff --git a/pkgs/development/libraries/mpeg2dec/builder.sh b/pkgs/development/libraries/mpeg2dec/builder.sh deleted file mode 100644 index 6dc6a220e9246..0000000000000 --- a/pkgs/development/libraries/mpeg2dec/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -. $stdenv/setup || exit 1 - -tar xvfz $src || exit 1 -cd mpeg2dec-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 -strip -S $out/lib/*.a || exit 1 diff --git a/pkgs/development/libraries/mpeg2dec/default.nix b/pkgs/development/libraries/mpeg2dec/default.nix index a57314a3fddd4..bc31f0731dec4 100644 --- a/pkgs/development/libraries/mpeg2dec/default.nix +++ b/pkgs/development/libraries/mpeg2dec/default.nix @@ -1,8 +1,9 @@ -{stdenv, fetchurl}: stdenv.mkDerivation { - name = "mpeg2dec-20030612"; - builder = ./builder.sh; +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "mpeg2dec-0.4.0b"; src = fetchurl { - url = http://libmpeg2.sourceforge.net/files/mpeg2dec-0.4.0.tar.gz; - md5 = "49a70fef1b0f710ed7e64ed32ee82d4d"; + url = http://libmpeg2.sourceforge.net/files/mpeg2dec-0.4.0b.tar.gz; + md5 = "52d10ea80595ec83d8557ba7ac6dc8e6"; }; } diff --git a/pkgs/development/libraries/wxGTK/builder.sh b/pkgs/development/libraries/wxGTK/builder.sh deleted file mode 100644 index d2b0880add936..0000000000000 --- a/pkgs/development/libraries/wxGTK/builder.sh +++ /dev/null @@ -1,13 +0,0 @@ -buildinputs="$pkgconfig $gtk $libtiff $libjpeg $libpng $zlib" -. $stdenv/setup - -extraflags= -if test -z "$compat22"; then - extraflags="--disable-compat22 $extraflags" -fi - -tar xvfj $src -cd wxGTK-* -./configure --prefix=$out --enable-gtk2 $extraflags -make -make install diff --git a/pkgs/development/libraries/wxGTK/default.nix b/pkgs/development/libraries/wxGTK/default.nix index 27bfcf2ebff9c..a30aaa1b81d97 100644 --- a/pkgs/development/libraries/wxGTK/default.nix +++ b/pkgs/development/libraries/wxGTK/default.nix @@ -9,15 +9,17 @@ assert gtk.libpng.zlib != null; stdenv.mkDerivation { name = "wxGTK-2.4.2"; - builder = ./builder.sh; src = fetchurl { url = http://heanet.dl.sourceforge.net/sourceforge/wxwindows/wxGTK-2.4.2.tar.bz2; md5 = "cdadfe82fc93f8a65a2ae18a95b0b0e3"; }; - libtiff = gtk.libtiff; - libjpeg = gtk.libjpeg; - libpng = gtk.libpng; - zlib = gtk.libpng.zlib; - inherit pkgconfig gtk compat22; + buildinputs = [pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib]; + + configureFlags = [ + "--enable-gtk2" + (if compat22 then "--enable-compat22" else "--disable-compat22") + ]; + + inherit gtk compat22; } |