summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-09-20 23:25:24 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2019-09-20 23:25:24 -0400
commitd8b7b95ac655e8cd7ca1936087aaa26c8905a438 (patch)
treef3bf69e556713001f6794195b6ce15a7e3beb7ae /pkgs/stdenv
parentf7e4eeda6c0cd6299bf77a6923eac12d21c62d67 (diff)
parentabbb9ea8485aa375be1c8c68916df7ca8aab5f40 (diff)
downloadnixpkgs-d8b7b95ac655e8cd7ca1936087aaa26c8905a438.tar
nixpkgs-d8b7b95ac655e8cd7ca1936087aaa26c8905a438.tar.gz
nixpkgs-d8b7b95ac655e8cd7ca1936087aaa26c8905a438.tar.bz2
nixpkgs-d8b7b95ac655e8cd7ca1936087aaa26c8905a438.tar.lz
nixpkgs-d8b7b95ac655e8cd7ca1936087aaa26c8905a438.tar.xz
nixpkgs-d8b7b95ac655e8cd7ca1936087aaa26c8905a438.tar.zst
nixpkgs-d8b7b95ac655e8cd7ca1936087aaa26c8905a438.zip
Merge remote-tracking branch 'origin/master' into staging
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;
     };