public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: NIX_*_COMPILE -> string

Browse Source
This commit is contained in:
Robin Gloster
2019-10-30 01:40:49 +01:00
committed by Jan Tojnar
parent 981ae25113
commit ab0cfd9e03
34 changed files with 51 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/gsl/default.nix
View File

@@ -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";
# https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html
doCheck = stdenv.hostPlatform.system != "i686-linux" && stdenv.hostPlatform.system != "aarch64-linux";

2
pkgs/development/libraries/gsl/gsl-1_16.nix
View File

@@ -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 {