diff options
| author | volth <volth@volth.com> | 2020-08-05 02:32:41 +0000 |
|---|---|---|
| committer | volth <volth@volth.com> | 2020-08-05 11:18:26 +0000 |
| commit | cf7b63df5b9efdef4e8e1b3261d7040199f7e671 (patch) | |
| tree | 74dbf7a1731896d48e90671f2b3dfb4dff91ec40 /pkgs/applications | |
| parent | 463db72e631e0bd4a835796324eb1981071c6ee4 (diff) | |
| download | nixpkgs-cf7b63df5b9efdef4e8e1b3261d7040199f7e671.tar nixpkgs-cf7b63df5b9efdef4e8e1b3261d7040199f7e671.tar.gz nixpkgs-cf7b63df5b9efdef4e8e1b3261d7040199f7e671.tar.bz2 nixpkgs-cf7b63df5b9efdef4e8e1b3261d7040199f7e671.tar.lz nixpkgs-cf7b63df5b9efdef4e8e1b3261d7040199f7e671.tar.xz nixpkgs-cf7b63df5b9efdef4e8e1b3261d7040199f7e671.tar.zst nixpkgs-cf7b63df5b9efdef4e8e1b3261d7040199f7e671.zip | |
gcc.arch: refactor, move tables under lib/
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/science/math/nauty/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index c1d408213b9..d75fc9731cd 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -10,15 +10,13 @@ stdenv.mkDerivation rec { sha256 = "1nym0p2djws8ylkpr0kgpxfa6fxdlh46cmvz0gn5vd02jzgs0aww"; }; outputs = [ "out" "dev" ]; - configureFlags = { + configureFlags = [ # Prevent nauty from sniffing some cpu features. While those are very # widely available, it can lead to nasty bugs when they are not available: # https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA - default = [ "--disable-clz" "--disable-popcnt" ]; - westmere = [ "--disable-clz" ]; - sandybridge = [ "--disable-clz" ]; - ivybridge = [ "--disable-clz" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"} or []; + "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-popcnt" + "--${if stdenv.hostPlatform.sse4_aSupport then "enable" else "disable"}-clz" + ]; installPhase = '' mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty} |