summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-09-19 12:46:15 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2019-09-19 12:52:28 -0400
commit07d78691da23038caef6c7c23c6565c731c72cec (patch)
tree2f7ef4b5330d2df9b9060fd3dc7a6813e25d2d85 /pkgs/stdenv
parentfa639e71c9ca2242ac5261d8a5439dea001157d5 (diff)
downloadnixpkgs-07d78691da23038caef6c7c23c6565c731c72cec.tar
nixpkgs-07d78691da23038caef6c7c23c6565c731c72cec.tar.gz
nixpkgs-07d78691da23038caef6c7c23c6565c731c72cec.tar.bz2
nixpkgs-07d78691da23038caef6c7c23c6565c731c72cec.tar.lz
nixpkgs-07d78691da23038caef6c7c23c6565c731c72cec.tar.xz
nixpkgs-07d78691da23038caef6c7c23c6565c731c72cec.tar.zst
nixpkgs-07d78691da23038caef6c7c23c6565c731c72cec.zip
stdenv/adapters.nix: remove static from makeStaticLibraries
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.
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/adapters.nix1
1 files changed, 0 insertions, 1 deletions
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;
     };