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

qtbase: Fix x86_64-conditional logic

Browse Source 
Now works with cross and old and new meta checks alike.
This commit is contained in:
John Ericson 2018-03-09 18:03:00 -05:00
parent 1bc5bf4beb
commit dde80d705e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/qt-5/modules/qtbase.nix
View File

@ -30,7 +30,6 @@ assert withGtk3 -> dconf != null;
assert withGtk3 -> gtk3 != null; assert withGtk3 -> gtk3 != null;
let let
system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
compareVersion = v: builtins.compareVersions version v; compareVersion = v: builtins.compareVersions version v;
in in
@ -258,7 +257,7 @@ stdenv.mkDerivation {
"-no-warnings-are-errors" "-no-warnings-are-errors"
] ]
++ ( ++ (
if (!system-x86_64) if (!stdenv.hostPlatform.isx86_64)
then [ "-no-sse2" ] then [ "-no-sse2" ]
else lib.optional (compareVersion "5.9.0" >= 0) [ "-sse2" ] else lib.optional (compareVersion "5.9.0" >= 0) [ "-sse2" ]
) )