diff options
| author | volth <volth@volth.com> | 2019-05-05 23:40:20 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:28:18 +0000 |
| commit | 56a4b2b477a63be9bb1fd016dc9ccfc2bbebf600 (patch) | |
| tree | 8cdbfcec6eee3e6c28d990a1071241c25e126e26 /nixpkgs/pkgs/development/libraries/dlib | |
| parent | 84875aacac4550333888ac4a5624c08157c3a673 (diff) | |
| download | nixlib-56a4b2b477a63be9bb1fd016dc9ccfc2bbebf600.tar nixlib-56a4b2b477a63be9bb1fd016dc9ccfc2bbebf600.tar.gz nixlib-56a4b2b477a63be9bb1fd016dc9ccfc2bbebf600.tar.bz2 nixlib-56a4b2b477a63be9bb1fd016dc9ccfc2bbebf600.tar.lz nixlib-56a4b2b477a63be9bb1fd016dc9ccfc2bbebf600.tar.xz nixlib-56a4b2b477a63be9bb1fd016dc9ccfc2bbebf600.tar.zst nixlib-56a4b2b477a63be9bb1fd016dc9ccfc2bbebf600.zip | |
platform.gcc.arch: support for AMD CPUs
(cherry picked from commit 463db72e631e0bd4a835796324eb1981071c6ee4)
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/dlib')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/dlib/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/dlib/default.nix b/nixpkgs/pkgs/development/libraries/dlib/default.nix index a7d68d62f2ae..359e8a15f020 100644 --- a/nixpkgs/pkgs/development/libraries/dlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/dlib/default.nix @@ -2,7 +2,7 @@ , guiSupport ? false, libX11 # see http://dlib.net/compile.html -, avxSupport ? true +, avxSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1"] , cudaSupport ? true }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { rm -rf dlib/external ''; - cmakeFlags = [ + cmakeFlags = [ "-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}" "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; |