From 39dc112bc13126cd0ff28a5e83d158bdd7c0e4e3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 11 Jun 2013 13:54:16 +0200 Subject: [PATCH] multiple-outputs.nix: Allow not setting configure flags Not everything is Autoconf... --- pkgs/build-support/multiple-outputs.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/build-support/multiple-outputs.nix b/pkgs/build-support/multiple-outputs.nix index 5d9dab76968..e72bc7fd3db 100644 --- a/pkgs/build-support/multiple-outputs.nix +++ b/pkgs/build-support/multiple-outputs.nix @@ -2,28 +2,28 @@ with stdenv.lib; -{ outputs ? [ "out" ], ... } @ args: +{ outputs ? [ "out" ], setOutputConfigureFlags ? true, ... } @ args: stdenv.mkDerivation (args // { #postPhases = [ "fixupOutputsPhase" ] ++ args.postPhases or []; preHook = - optionalString (elem "man" outputs) '' - configureFlags="--mandir=$man/share/man $configureFlags" - '' + - '' - ${optionalString (elem "bin" outputs) '' + if setOutputConfigureFlags then + optionalString (elem "man" outputs) '' + configureFlags="--mandir=$man/share/man $configureFlags" + '' + + optionalString (elem "bin" outputs) '' configureFlags="--bindir=$bin/bin --mandir=$bin/share/man $configureFlags" - ''} - ${optionalString (elem "lib" outputs) '' + '' + + optionalString (elem "lib" outputs) '' configureFlags="--libdir=$lib/lib $configureFlags" - ''} - ${optionalString (elem "dev" outputs) '' + '' + + optionalString (elem "dev" outputs) '' configureFlags="--includedir=$dev/include $configureFlags" installFlags="pkgconfigdir=$dev/lib/pkgconfig m4datadir=$dev/share/aclocal aclocaldir=$dev/share/aclocal $installFlags" - ''} - ''; + '' + else null; preFixup = ''