diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-01-11 15:06:09 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-01-11 15:06:09 +0000 |
| commit | a0c07c35c3fe7e75e557fdb97de89b16c4c9ae2e (patch) | |
| tree | cd0f925891ef870137f741967566cc94b72e9840 /pkgs | |
| parent | 9eb147a0f84052f762dca7fd2c33358adb9a7169 (diff) | |
| download | nixlib-a0c07c35c3fe7e75e557fdb97de89b16c4c9ae2e.tar nixlib-a0c07c35c3fe7e75e557fdb97de89b16c4c9ae2e.tar.gz nixlib-a0c07c35c3fe7e75e557fdb97de89b16c4c9ae2e.tar.bz2 nixlib-a0c07c35c3fe7e75e557fdb97de89b16c4c9ae2e.tar.lz nixlib-a0c07c35c3fe7e75e557fdb97de89b16c4c9ae2e.tar.xz nixlib-a0c07c35c3fe7e75e557fdb97de89b16c4c9ae2e.tar.zst nixlib-a0c07c35c3fe7e75e557fdb97de89b16c4c9ae2e.zip | |
* Give imake what it wants: gccmakedep instead of makedepend.
svn path=/nixpkgs/trunk/; revision=4536
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/Xaw3d/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 8b3a405f3e1a..f4af1ec13a84 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -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 { name = "Xaw3d-1.5E"; @@ -8,6 +8,6 @@ stdenv.mkDerivation { md5 = "29ecfdcd6bcf47f62ecfd672d31269a1"; }; patches = [./config.patch]; - buildInputs = [x11 imake makedepend libXmu libXpm libXp bison flex]; + buildInputs = [x11 imake gccmakedep libXmu libXpm libXp bison flex]; propagatedBuildInputs = [x11 libXmu]; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index b66d7ade659b..56f662447593 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -1137,8 +1137,7 @@ rec { Xaw3d = import ../development/libraries/Xaw3d { inherit fetchurl stdenv x11 bison; flex = flexnew; - # !!! makedepend is impure - inherit (xlibs) imake makedepend libXmu libXpm libXp; + inherit (xlibs) imake gccmakedep libXmu libXpm libXp; }; libdrm = import ../development/libraries/libdrm { |