diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-04-01 20:36:40 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-04-01 20:36:40 +0000 |
| commit | 36356d76949e281d3cd902d6d0c31fe95361195d (patch) | |
| tree | 030c64917e8c3a7cd64601acf94fe93500b1c458 /pkgs | |
| parent | 57c5759250458381ebb8375b9fbeb1acceb65442 (diff) | |
| download | nixpkgs-36356d76949e281d3cd902d6d0c31fe95361195d.tar nixpkgs-36356d76949e281d3cd902d6d0c31fe95361195d.tar.gz nixpkgs-36356d76949e281d3cd902d6d0c31fe95361195d.tar.bz2 nixpkgs-36356d76949e281d3cd902d6d0c31fe95361195d.tar.lz nixpkgs-36356d76949e281d3cd902d6d0c31fe95361195d.tar.xz nixpkgs-36356d76949e281d3cd902d6d0c31fe95361195d.tar.zst nixpkgs-36356d76949e281d3cd902d6d0c31fe95361195d.zip | |
* More sed breakage.
svn path=/nixpkgs/trunk/; revision=903
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/j2sdk/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/j2re/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk+/gtk+/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 4 | ||||
| -rw-r--r-- | pkgs/system/populate-cache.nix | 2 |
5 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/development/compilers/j2sdk/default.nix b/pkgs/development/compilers/j2sdk/default.nix index aae15370110..d60a940245a 100644 --- a/pkgs/development/compilers/j2sdk/default.nix +++ b/pkgs/development/compilers/j2sdk/default.nix @@ -3,7 +3,7 @@ if stdenv.system == "i686-linux" then (import ./j2sdk-sun-linux.nix) { - fetchurl = fetchurl; + inherit stdenv fetchurl; } else false diff --git a/pkgs/development/interpreters/j2re/default.nix b/pkgs/development/interpreters/j2re/default.nix index 3fa417657ea..348703c17ce 100644 --- a/pkgs/development/interpreters/j2re/default.nix +++ b/pkgs/development/interpreters/j2re/default.nix @@ -3,7 +3,7 @@ if stdenv.system == "i686-linux" then (import ./j2re-sun-linux.nix) { - fetchurl = fetchurl; + inherit stdenv fetchurl; } else false diff --git a/pkgs/development/libraries/gtk+/gtk+/default.nix b/pkgs/development/libraries/gtk+/gtk+/default.nix index 16b322ee7ae..e1eef805803 100644 --- a/pkgs/development/libraries/gtk+/gtk+/default.nix +++ b/pkgs/development/libraries/gtk+/gtk+/default.nix @@ -17,4 +17,5 @@ stdenv.mkDerivation { }; buildInputs = [pkgconfig perl libtiff libjpeg libpng]; propagatedBuildInputs = [x11 glib atk pango]; + inherit libtiff libjpeg libpng; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 12f57713e40..8ce50c8e1b3 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -588,10 +588,6 @@ rec { inherit fetchurl stdenv pkgconfig xproto libX11; }; - libXpmdist = (import ../development/libraries/freedesktop/libXpm/make-dist.nix) { - inherit stdenv pkgconfig autoconf automake libtool xproto libX11; - }; - libXaw = (import ../development/libraries/freedesktop/libXaw) { inherit fetchurl stdenv pkgconfig xproto libX11 libXt libXmu libXpm; }; diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix index a29bf0aabc4..ba135ab9289 100644 --- a/pkgs/system/populate-cache.nix +++ b/pkgs/system/populate-cache.nix @@ -49,7 +49,7 @@ let { pkgs.gqview pkgs.hello pkgs.nxml -# pkgs.uml + pkgs.uml pkgs.nix ]; } |