* More sed breakage.

svn path=/nixpkgs/trunk/; revision=903
This commit is contained in:
Eelco Dolstra 2004-04-01 20:36:40 +00:00
parent 57c5759250
commit 36356d7694
5 changed files with 4 additions and 7 deletions

View file

@ -3,7 +3,7 @@
if stdenv.system == "i686-linux"
then
(import ./j2sdk-sun-linux.nix) {
fetchurl = fetchurl;
inherit stdenv fetchurl;
}
else
false

View file

@ -3,7 +3,7 @@
if stdenv.system == "i686-linux"
then
(import ./j2re-sun-linux.nix) {
fetchurl = fetchurl;
inherit stdenv fetchurl;
}
else
false

View file

@ -17,4 +17,5 @@ stdenv.mkDerivation {
};
buildInputs = [pkgconfig perl libtiff libjpeg libpng];
propagatedBuildInputs = [x11 glib atk pango];
inherit libtiff libjpeg libpng;
}

View file

@ -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;
};

View file

@ -49,7 +49,7 @@ let {
pkgs.gqview
pkgs.hello
pkgs.nxml
# pkgs.uml
pkgs.uml
pkgs.nix
];
}