diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-03 12:36:51 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-03 17:06:03 -0400 |
| commit | 3e034bac1ae1db6ded4eaae0de5153302e683ca5 (patch) | |
| tree | 385a7eda0e8b97943f4211b95911069ccb2b9ae0 /pkgs/stdenv/adapters.nix | |
| parent | f0d6b385d12600ab307ab205c166c993d3588087 (diff) | |
| download | nixpkgs-3e034bac1ae1db6ded4eaae0de5153302e683ca5.tar nixpkgs-3e034bac1ae1db6ded4eaae0de5153302e683ca5.tar.gz nixpkgs-3e034bac1ae1db6ded4eaae0de5153302e683ca5.tar.bz2 nixpkgs-3e034bac1ae1db6ded4eaae0de5153302e683ca5.tar.lz nixpkgs-3e034bac1ae1db6ded4eaae0de5153302e683ca5.tar.xz nixpkgs-3e034bac1ae1db6ded4eaae0de5153302e683ca5.tar.zst nixpkgs-3e034bac1ae1db6ded4eaae0de5153302e683ca5.zip | |
stdenv adapter: Keep configureFlags a list
Diffstat (limited to 'pkgs/stdenv/adapters.nix')
| -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 66570cba946..7d527729273 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" + ]; }); }; |