summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2016-03-08 11:30:20 +0100
committerPeter Simons <simons@cryp.to>2016-03-08 11:30:20 +0100
commit35bae56722d76356bd0b41280fd3235fb7ff0189 (patch)
treed0c2382e67e7a944eaf82f22a3750ebd7c8b37c1 /pkgs/development
parent615afdf368965a8fee6c86644743c4b281d80c15 (diff)
parentf7bf249b2be4845a3b758d1271e836020a33ea2f (diff)
downloadnixlib-35bae56722d76356bd0b41280fd3235fb7ff0189.tar
nixlib-35bae56722d76356bd0b41280fd3235fb7ff0189.tar.gz
nixlib-35bae56722d76356bd0b41280fd3235fb7ff0189.tar.bz2
nixlib-35bae56722d76356bd0b41280fd3235fb7ff0189.tar.lz
nixlib-35bae56722d76356bd0b41280fd3235fb7ff0189.tar.xz
nixlib-35bae56722d76356bd0b41280fd3235fb7ff0189.tar.zst
nixlib-35bae56722d76356bd0b41280fd3235fb7ff0189.zip
Merge pull request #13754 from spacefrogg/boost-static
boost: Fix compilation for static builds.
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/boost/generic.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 90e60d59da0c..b28668e7b301 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -58,7 +58,7 @@ let
     "--layout=${layout}"
     "variant=${variant}"
     "threading=${threading}"
-    "runtime-link=${runtime-link}"
+  ] ++ optional (link != "static") "runtime-link=${runtime-link}" ++ [
     "link=${link}"
     "${cflags}"
   ] ++ optional (variant == "release") "debug-symbols=off";