about summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-05-18 15:02:33 -0500
committerGitHub <noreply@github.com>2019-05-18 15:02:33 -0500
commit5ba633970b5fc98ea048cbdf89e0662cf0526a37 (patch)
tree5287c026a88e5efbc1aa0fae0e81350e353cc434 /pkgs/stdenv
parent888dba6a1d7c15eb6463abb991306105617671d8 (diff)
parentfea2422398c9b1c6a9bddf0d0544bd9aad783f84 (diff)
Merge pull request #61169 from matthewbauer/meson-static
static: set default_library flag for meson in makeStaticLibrary
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/adapters.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 7823d6413442d..2b1f166f8c328 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -60,6 +60,7 @@ rec {
           "--enable-static"
           "--disable-shared"
         ];
+        mesonFlags = (args.mesonFlags or []) ++ [ "-Ddefault_library=static" ];
       });
     };