diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-08-03 17:49:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-03 17:49:01 -0400 |
| commit | 7a337cde318020a0f91702bfefee85a7b31be06f (patch) | |
| tree | c49f254cfc7923c8f60b589449ea0dc11e1fa694 /pkgs/stdenv | |
| parent | 8c784998f64da2d4c388f40a03f6604c8a2e0b45 (diff) | |
| parent | 3e034bac1ae1db6ded4eaae0de5153302e683ca5 (diff) | |
| download | nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.tar nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.tar.gz nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.tar.bz2 nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.tar.lz nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.tar.xz nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.tar.zst nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.zip | |
Merge pull request #44423 from obsidiansystems/configureFlags-cleanup
treewide: All configureFlags are lists
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 66570cba946e..7d5277292738 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -34,9 +34,9 @@ rec { makeStaticBinaries = stdenv: stdenv // { mkDerivation = args: stdenv.mkDerivation (args // { NIX_CFLAGS_LINK = "-static"; - configureFlags = - toString args.configureFlags or "" - + " --disable-shared"; # brrr... + configureFlags = (args.configureFlags or []) ++ [ + "--disable-shared" # brrr... + ]; }); isStatic = true; }; @@ -47,9 +47,10 @@ rec { makeStaticLibraries = stdenv: stdenv // { mkDerivation = args: stdenv.mkDerivation (args // { dontDisableStatic = true; - configureFlags = - toString args.configureFlags or "" - + " --enable-static --disable-shared"; + configureFlags = (args.configureFlags or []) ++ [ + "--enable-static" + "--disable-shared" + ]; }); }; |