From 07d78691da23038caef6c7c23c6565c731c72cec Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 19 Sep 2019 12:46:15 -0400 Subject: [PATCH] stdenv/adapters.nix: remove static from makeStaticLibraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This logic should be in the pkgs/top-level/static.nix. We don’t want to pollute Nixpkgs with =if stdenv.static=. Also, "static" is not descriptive. We have two types of static stdenvs, ‘makeStaticLibaries’ and ‘makeStaticBinaries’. We shouldn’t rely on a static boolean like this. --- pkgs/stdenv/adapters.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 8f62bd24dda..041964bcacc 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -62,7 +62,6 @@ rec { ]; mesonFlags = (args.mesonFlags or []) ++ [ "-Ddefault_library=static" ]; }); - static = true; };