From 36356d76949e281d3cd902d6d0c31fe95361195d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Apr 2004 20:36:40 +0000
Subject: [PATCH] * More sed breakage.
svn path=/nixpkgs/trunk/; revision=903
---
pkgs/development/compilers/j2sdk/default.nix | 2 +-
pkgs/development/interpreters/j2re/default.nix | 2 +-
pkgs/development/libraries/gtk+/gtk+/default.nix | 1 +
pkgs/system/all-packages-generic.nix | 4 ----
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 aae153701106..d60a940245af 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 3fa417657eac..348703c17cea 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 16b322ee7ae0..e1eef8058035 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 12f57713e407..8ce50c8e1b3c 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 a29bf0aabc46..ba135ab9289e 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
];
}