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

stdenv adapter: Keep configureFlags a list

Browse Source
This commit is contained in:
John Ericson 2018-08-03 12:36:51 -04:00
parent f0d6b385d1
commit 3e034bac1a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/stdenv/adapters.nix
View File

@ -34,9 +34,9 @@ rec {
makeStaticBinaries = stdenv: stdenv // makeStaticBinaries = stdenv: stdenv //
{ mkDerivation = args: stdenv.mkDerivation (args // { { mkDerivation = args: stdenv.mkDerivation (args // {
NIX_CFLAGS_LINK = "-static"; NIX_CFLAGS_LINK = "-static";
configureFlags = configureFlags = (args.configureFlags or []) ++ [
toString args.configureFlags or "" "--disable-shared" # brrr...
+ " --disable-shared"; # brrr... ];
}); });
isStatic = true; isStatic = true;
}; };
@ -47,9 +47,10 @@ rec {
makeStaticLibraries = stdenv: stdenv // makeStaticLibraries = stdenv: stdenv //
{ mkDerivation = args: stdenv.mkDerivation (args // { { mkDerivation = args: stdenv.mkDerivation (args // {
dontDisableStatic = true; dontDisableStatic = true;
configureFlags = configureFlags = (args.configureFlags or []) ++ [
toString args.configureFlags or "" "--enable-static"
+ " --enable-static --disable-shared"; "--disable-shared"
];
}); });
}; };