diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-09-11 15:24:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:14:45 +0000 |
| commit | 89c4dccbd5f33f71808d4b1baafe619696af1162 (patch) | |
| tree | fb1b8d3a2f171164a05d404ab2340cfb1a9d3e21 /nixpkgs/pkgs/development/libraries/g2o | |
| parent | 8920a0e4d962a919238bab69ddc607d7f3396f70 (diff) | |
| parent | e19054ab3cd5b7cc9a01d0efc71c8fe310541065 (diff) | |
| download | nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.gz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.bz2 nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.lz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.xz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.zst nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.zip | |
Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/g2o')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/g2o/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/g2o/default.nix b/nixpkgs/pkgs/development/libraries/g2o/default.nix index 909c504870f0..21975766e74e 100644 --- a/nixpkgs/pkgs/development/libraries/g2o/default.nix +++ b/nixpkgs/pkgs/development/libraries/g2o/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { "-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer" "-DG2O_BUILD_EXAMPLES=OFF" ] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ { - "default" = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; - "westmere" = [ "-DDISABLE_SSE4_A=ON" ]; - "sandybridge" = [ "-DDISABLE_SSE4_A=ON" ]; - "ivybridge" = [ "-DDISABLE_SSE4_A=ON" ]; - "haswell" = [ "-DDISABLE_SSE4_A=ON" ]; - "broadwell" = [ "-DDISABLE_SSE4_A=ON" ]; - "skylake" = [ "-DDISABLE_SSE4_A=ON" ]; - "skylake-avx512" = [ "-DDISABLE_SSE4_A=ON" ]; + default = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; + westmere = [ "-DDISABLE_SSE4_A=ON" ]; + sandybridge = [ "-DDISABLE_SSE4_A=ON" ]; + ivybridge = [ "-DDISABLE_SSE4_A=ON" ]; + haswell = [ "-DDISABLE_SSE4_A=ON" ]; + broadwell = [ "-DDISABLE_SSE4_A=ON" ]; + skylake = [ "-DDISABLE_SSE4_A=ON" ]; + skylake-avx512 = [ "-DDISABLE_SSE4_A=ON" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"}); postInstall = '' |