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

GNU Make: Make `nix-log2xml' support optional.

Browse Source 
One question remains: how to make the option available to the user.
`getConfig' is nice but useless as long as `useFromStdenv' prevails.

svn path=/nixpkgs/trunk/; revision=12311
This commit is contained in:
Ludovic Courtès 2008-07-07 22:02:36 +00:00
parent 4650c3ddc5
commit 4793092374
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/tools/build-managers/gnumake/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl}: {stdenv, fetchurl, log2xmlSupport ? true}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gnumake-3.81"; name = "gnumake-3.81";
@ -7,11 +7,14 @@ stdenv.mkDerivation {
md5 = "354853e0b2da90c527e35aabb8d6f1e6"; md5 = "354853e0b2da90c527e35aabb8d6f1e6";
}; };
patches = [ patches =
(if log2xmlSupport
# Provide nested log output for subsequent pretty-printing by # Provide nested log output for subsequent pretty-printing by
# nix-log2xml. # nix-log2xml.
./log.patch then [ ./log.patch ]
else [])
++
[
# Purity: don't look for library dependencies (of the form # Purity: don't look for library dependencies (of the form
# `-lfoo') in /lib and /usr/lib. It's a stupid feature anyway. # `-lfoo') in /lib and /usr/lib. It's a stupid feature anyway.
# Likewise, when searching for included Makefiles, don't look in # Likewise, when searching for included Makefiles, don't look in