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

* Give imake what it wants: gccmakedep instead of makedepend. 

svn path=/nixpkgs/trunk/; revision=4536
This commit is contained in:
Eelco Dolstra 2006-01-11 15:06:09 +00:00
parent 9eb147a0f8
commit a0c07c35c3
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/Xaw3d/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, x11, imake, makedepend, libXmu, libXpm, libXp, bison, flex}: {stdenv, fetchurl, x11, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "Xaw3d-1.5E"; name = "Xaw3d-1.5E";
@ -8,6 +8,6 @@ stdenv.mkDerivation {
md5 = "29ecfdcd6bcf47f62ecfd672d31269a1"; md5 = "29ecfdcd6bcf47f62ecfd672d31269a1";
}; };
patches = [./config.patch]; patches = [./config.patch];
buildInputs = [x11 imake makedepend libXmu libXpm libXp bison flex]; buildInputs = [x11 imake gccmakedep libXmu libXpm libXp bison flex];
propagatedBuildInputs = [x11 libXmu]; propagatedBuildInputs = [x11 libXmu];
} }

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

@ -1137,8 +1137,7 @@ rec {
Xaw3d = import ../development/libraries/Xaw3d { Xaw3d = import ../development/libraries/Xaw3d {
inherit fetchurl stdenv x11 bison; inherit fetchurl stdenv x11 bison;
flex = flexnew; flex = flexnew;
# !!! makedepend is impure inherit (xlibs) imake gccmakedep libXmu libXpm libXp;
inherit (xlibs) imake makedepend libXmu libXpm libXp;
}; };
libdrm = import ../development/libraries/libdrm { libdrm = import ../development/libraries/libdrm {