diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 03:59:58 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 03:59:58 +0100 |
commit | 0c2adc0fb1b0b551bef119477f37b86190cd9cc5 (patch) | |
tree | f0fe93cd1157d2f0ef8f2cb052c48124f866386b /pkgs/development/libraries/gsl/gsl-1_16.nix | |
parent | d6136b744a75e641d58d56115b1972b7dd1f4884 (diff) | |
parent | c5406e30b02df521e75c4f5b7de62be322b05810 (diff) | |
download | nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.gz nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.bz2 nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.lz nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.xz nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.zst nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.zip |
Merge branch 'staging' into staging-next
Diffstat (limited to 'pkgs/development/libraries/gsl/gsl-1_16.nix')
-rw-r--r-- | pkgs/development/libraries/gsl/gsl-1_16.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix index e5772c8772ec..ae102ac60307 100644 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isx86_64 "-mno-fma"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isx86_64 "-mno-fma"; patches = [ (fetchpatch { |