From 942199655bea077a5732c293493641b1b2df7d9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 10 Jul 2008 15:19:28 +0000 Subject: [PATCH] Make GNU Make's `nix-log2xml' support optional via `getConfig'. svn path=/nixpkgs/trunk/; revision=12335 --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25468858569..5d7200ee378 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2102,10 +2102,10 @@ let pkgs = rec { inherit fetchurl stdenv; }; - gnumake = useFromStdenv "gnumake" - (import ../development/tools/build-managers/gnumake { - inherit fetchurl stdenv; - }); + gnumake = import ../development/tools/build-managers/gnumake { + inherit fetchurl stdenv; + log2xmlSupport = getConfig [ "gnuMake" "log2xmlSupport" ] true; + }; gnumake380 = import ../development/tools/build-managers/gnumake-3.80 { inherit fetchurl stdenv;