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

treewide: configureFlags is a flat list

Browse Source
This commit is contained in:
Robin Gloster
2019-12-31 01:37:49 +01:00
committed by Jan Tojnar
parent e9c27ed5f9
commit 6ca6ac796b
18 changed files with 39 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/gifsicle/default.nix
+3 -4
View File
@@ -11,12 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "0rffpzxcak19k6cngpxn73khvm3z1gswrqs90ycdzzb53p05ddas";
};
buildInputs = optional gifview [ xorgproto libXt libX11 ];
buildInputs = optionals gifview [ xorgproto libXt libX11 ];
configureFlags = []
++ optional (!gifview) [ "--disable-gifview" ];
configureFlags = optional (!gifview) "--disable-gifview";
LDFLAGS = optional static "-static";
LDFLAGS = optionalString static "-static";
doCheck = true;
checkPhase = ''
pkgs/tools/graphics/graphviz/base.nix
+1 -1
View File
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
configureFlags = [
"--with-ltdl-lib=${libtool.lib}/lib"
"--with-ltdl-include=${libtool}/include"
] ++ stdenv.lib.optional (xorg == null) [ "--without-x" ];
] ++ stdenv.lib.optional (xorg == null) "--without-x";
inherit patches;