public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* More sed breakage.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/j2sdk/default.nix
View File

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

2
pkgs/development/interpreters/j2re/default.nix
View File

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

1
pkgs/development/libraries/gtk+/gtk+/default.nix
View File

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

4
pkgs/system/all-packages-generic.nix
View File

@ -588,10 +588,6 @@ rec {
inherit fetchurl stdenv pkgconfig xproto libX11; 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) { libXaw = (import ../development/libraries/freedesktop/libXaw) {
inherit fetchurl stdenv pkgconfig xproto libX11 libXt libXmu libXpm; inherit fetchurl stdenv pkgconfig xproto libX11 libXt libXmu libXpm;
}; };

2
pkgs/system/populate-cache.nix
View File

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