diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-03-09 18:03:00 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-03-12 18:55:41 -0400 |
| commit | dde80d705e4b47e8ad7774037533e46ad1f7d53c (patch) | |
| tree | bf040bf906a20956d490e96061136d2d0c44282a /pkgs/development/libraries/qt-5/modules | |
| parent | 1bc5bf4beb759e563ffc7a8a3067f10a00b45a7d (diff) | |
| download | nixlib-dde80d705e4b47e8ad7774037533e46ad1f7d53c.tar nixlib-dde80d705e4b47e8ad7774037533e46ad1f7d53c.tar.gz nixlib-dde80d705e4b47e8ad7774037533e46ad1f7d53c.tar.bz2 nixlib-dde80d705e4b47e8ad7774037533e46ad1f7d53c.tar.lz nixlib-dde80d705e4b47e8ad7774037533e46ad1f7d53c.tar.xz nixlib-dde80d705e4b47e8ad7774037533e46ad1f7d53c.tar.zst nixlib-dde80d705e4b47e8ad7774037533e46ad1f7d53c.zip | |
qtbase: Fix x86_64-conditional logic
Now works with cross and old and new meta checks alike.
Diffstat (limited to 'pkgs/development/libraries/qt-5/modules')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtbase.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 3a0a7326f762..c6473ff188a7 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -30,7 +30,6 @@ assert withGtk3 -> dconf != null; assert withGtk3 -> gtk3 != null; let - system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; compareVersion = v: builtins.compareVersions version v; in @@ -258,7 +257,7 @@ stdenv.mkDerivation { "-no-warnings-are-errors" ] ++ ( - if (!system-x86_64) + if (!stdenv.hostPlatform.isx86_64) then [ "-no-sse2" ] else lib.optional (compareVersion "5.9.0" >= 0) [ "-sse2" ] ) |