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

treewide: Make more complicated configureFlags lists

Browse Source
This commit is contained in:
John Ericson
2018-07-25 17:44:21 -04:00
parent 632d24f11f
commit 85a9913edd
27 changed files with 193 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/neon/0.29.nix
View File

@@ -28,13 +28,12 @@ stdenv.mkDerivation rec {
buildInputs = [libxml2 openssl]
++ stdenv.lib.optional compressionSupport zlib;
configureFlags = ''
${if shared then "--enable-shared" else "--disable-shared"}
${if static then "--enable-static" else "--disable-static"}
${if compressionSupport then "--with-zlib" else "--without-zlib"}
${if sslSupport then "--with-ssl" else "--without-ssl"}
--enable-shared
'';
configureFlags = [
(stdenv.lib.enableFeature shared "shared")
(stdenv.lib.enableFeature static "static")
(stdenv.lib.withFeature compressionSupport "zlib")
(stdenv.lib.withFeature sslSupport "ssl")
];
passthru = {inherit compressionSupport sslSupport;};

13
pkgs/development/libraries/neon/default.nix
View File

@@ -28,13 +28,12 @@ stdenv.mkDerivation rec {
buildInputs = [libxml2 openssl]
++ stdenv.lib.optional compressionSupport zlib;
configureFlags = ''
${if shared then "--enable-shared" else "--disable-shared"}
${if static then "--enable-static" else "--disable-static"}
${if compressionSupport then "--with-zlib" else "--without-zlib"}
${if sslSupport then "--with-ssl" else "--without-ssl"}
--enable-shared
'';
configureFlags = [
(stdenv.lib.enableFeature shared "shared")
(stdenv.lib.enableFeature static "static")
(stdenv.lib.withFeature compressionSupport "zlib")
(stdenv.lib.withFeature sslSupport "ssl")
];
passthru = {inherit compressionSupport sslSupport;};