From 5a4de2c5de00ffb8fd5428d99e2ec9ce0bdb3564 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Mar 2004 15:15:19 +0000 Subject: [PATCH] * Remove builder attributes. * MPlayer: pass stdenv to w32codecs. svn path=/nixpkgs/trunk/; revision=882 --- pkgs/applications/networking/newsreaders/pan/default.nix | 1 - pkgs/applications/video/MPlayer/default.nix | 2 +- pkgs/development/libraries/freedesktop/libICE/default.nix | 1 - pkgs/development/libraries/freedesktop/libSM/default.nix | 1 - pkgs/development/libraries/freedesktop/libX11/default.nix | 1 - pkgs/development/libraries/freedesktop/libXau/default.nix | 1 - pkgs/development/libraries/freedesktop/libXt/default.nix | 1 - pkgs/development/libraries/freedesktop/libXtrans/default.nix | 1 - pkgs/development/libraries/freedesktop/xextensions/default.nix | 1 - pkgs/development/libraries/freedesktop/xproto/default.nix | 1 - pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix | 1 - pkgs/development/libraries/gtk+-1/glib/default.nix | 1 - pkgs/tools/networking/wget/default.nix | 1 - 13 files changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index aace5f60091..ee0d925b231 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -11,7 +11,6 @@ assert gtk.glib == gnet.glib; stdenv.mkDerivation { name = "pan-0.14.2.91"; - builder = ./builder.sh; src = fetchurl { url = http://pan.rebelbase.com/download/releases/0.14.2.91/SOURCE/pan-0.14.2.91.tar.bz2; md5 = "4770d899a1c1ba968ce96bc5aeb07b62"; diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index 6ce6441751a..69099449665 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { freetype = freetype; alsa = if alsaSupport then alsa else null; win32codecs = (import ./win32codecs) { - fetchurl = fetchurl; + inherit stdenv fetchurl; }; } diff --git a/pkgs/development/libraries/freedesktop/libICE/default.nix b/pkgs/development/libraries/freedesktop/libICE/default.nix index 6ff2e851997..daf4043215f 100644 --- a/pkgs/development/libraries/freedesktop/libICE/default.nix +++ b/pkgs/development/libraries/freedesktop/libICE/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation { name = "libICE-6.3.2"; - builder = ./builder.sh; src = fetchurl { url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libICE-6.3.2.tar.bz2; md5 = "06db02e3df846b127a6e2dc3e345039c"; diff --git a/pkgs/development/libraries/freedesktop/libSM/default.nix b/pkgs/development/libraries/freedesktop/libSM/default.nix index ed1765fa363..605749d764b 100644 --- a/pkgs/development/libraries/freedesktop/libSM/default.nix +++ b/pkgs/development/libraries/freedesktop/libSM/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation { name = "libSM-6.0.2"; - builder = ./builder.sh; src = fetchurl { url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libSM-6.0.2.tar.bz2; md5 = "0ecc3ec75391d9158f25a94a652bd387"; diff --git a/pkgs/development/libraries/freedesktop/libX11/default.nix b/pkgs/development/libraries/freedesktop/libX11/default.nix index 69a6ea554ae..b1b4512557a 100644 --- a/pkgs/development/libraries/freedesktop/libX11/default.nix +++ b/pkgs/development/libraries/freedesktop/libX11/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation { name = "libX11-6.2.1"; - builder = ./builder.sh; src = fetchurl { url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libX11-6.2.1.tar.bz2; md5 = "59b6fa7cd6fe7ee1da92fd1b56d1cee3"; diff --git a/pkgs/development/libraries/freedesktop/libXau/default.nix b/pkgs/development/libraries/freedesktop/libXau/default.nix index 894f0d5a088..1742ed793fe 100644 --- a/pkgs/development/libraries/freedesktop/libXau/default.nix +++ b/pkgs/development/libraries/freedesktop/libXau/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation { name = "libXau-0.1.1"; - builder = ./builder.sh; src = fetchurl { url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXau-0.1.1.tar.bz2; md5 = "3d747ada4a7d17538fa21c62d5608656"; diff --git a/pkgs/development/libraries/freedesktop/libXt/default.nix b/pkgs/development/libraries/freedesktop/libXt/default.nix index 0645a18446e..b00c0215cac 100644 --- a/pkgs/development/libraries/freedesktop/libXt/default.nix +++ b/pkgs/development/libraries/freedesktop/libXt/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation { name = "libXt-0.1.4"; - builder = ./builder.sh; src = fetchurl { url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXt-0.1.4.tar.bz2; md5 = "32b6528c9deb058d1a9ed17ffa848df8"; diff --git a/pkgs/development/libraries/freedesktop/libXtrans/default.nix b/pkgs/development/libraries/freedesktop/libXtrans/default.nix index a706397e085..a3e03d5c432 100644 --- a/pkgs/development/libraries/freedesktop/libXtrans/default.nix +++ b/pkgs/development/libraries/freedesktop/libXtrans/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation { name = "libXtrans-0.1"; - builder = ./builder.sh; src = fetchurl { url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXtrans-0.1.tar.bz2; md5 = "a5ae4c7a75f930053b8327f7bd0c1361"; diff --git a/pkgs/development/libraries/freedesktop/xextensions/default.nix b/pkgs/development/libraries/freedesktop/xextensions/default.nix index eac4b89ab3f..cd309ddb49d 100644 --- a/pkgs/development/libraries/freedesktop/xextensions/default.nix +++ b/pkgs/development/libraries/freedesktop/xextensions/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation { name = "xextensions-1.0.1"; - builder = ./builder.sh; src = fetchurl { url = http://freedesktop.org/~xlibs/release/xlibs-1.0/xextensions-1.0.1.tar.bz2; md5 = "e61bca2a4757b736c9557dc8a7df2217"; diff --git a/pkgs/development/libraries/freedesktop/xproto/default.nix b/pkgs/development/libraries/freedesktop/xproto/default.nix index 6cfea954802..8793a663fbc 100644 --- a/pkgs/development/libraries/freedesktop/xproto/default.nix +++ b/pkgs/development/libraries/freedesktop/xproto/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation { name = "xproto-6.6.1"; - builder = ./builder.sh; src = fetchurl { url = http://freedesktop.org/~xlibs/release/xlibs-1.0/xproto-6.6.1.tar.bz2; md5 = "8a7546a607dcd61b2ee595c763fd7f85"; diff --git a/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix b/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix index d0654900f02..d8d354962e9 100644 --- a/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix @@ -6,7 +6,6 @@ assert gtk != null && libtiff != null stdenv.mkDerivation { name = "gdk-pixbuf-0.22.0"; - builder = ./builder.sh; src = fetchurl { url = ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/0.22/gdk-pixbuf-0.22.0.tar.bz2; md5 = "05fcb68ceaa338614ab650c775efc2f2"; diff --git a/pkgs/development/libraries/gtk+-1/glib/default.nix b/pkgs/development/libraries/gtk+-1/glib/default.nix index f8bb0f0e782..f8990f5ce84 100644 --- a/pkgs/development/libraries/gtk+-1/glib/default.nix +++ b/pkgs/development/libraries/gtk+-1/glib/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation { name = "glib-1.2.10"; - builder = ./builder.sh; src = fetchurl { url = ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz; md5 = "6fe30dad87c77b91b632def29dd69ef9"; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 21bf4976908..95f59ca1238 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation { name = "wget-1.9.1"; - builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nl.net/pub/gnu/wget/wget-1.9.1.tar.gz; md5 = "e6051f1e1487ec0ebfdbda72bedc70ad";