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

nifskope: fix aarch64 build

Browse Source 
https://hydra.nixos.org/build/109694386
This commit is contained in:
Maximilian Bosch 2020-01-06 18:14:49 +01:00
parent 1bb691ff9f
commit 254d6e5cbf
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/graphics/nifskope/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation {
url = "https://github.com/niftools/nifskope/commit/30954e7f01f3d779a2a1fd37d363e8a6ad560bd3.patch"; url = "https://github.com/niftools/nifskope/commit/30954e7f01f3d779a2a1fd37d363e8a6ad560bd3.patch";
sha256 = "0d6xjj2mjjhdd7w1aig5f75jksjni16jyj0lxsz51pys6xqb6fpj"; sha256 = "0d6xjj2mjjhdd7w1aig5f75jksjni16jyj0lxsz51pys6xqb6fpj";
}) })
]; ] ++ (stdenv.lib.optional stdenv.isAarch64 ./no-sse-on-arm.patch);
buildInputs = [ qtbase qttools libGLU.dev ]; buildInputs = [ qtbase qttools libGLU.dev ];
nativeBuildInputs = [ qmake wrapQtAppsHook ]; nativeBuildInputs = [ qmake wrapQtAppsHook ];

19
pkgs/tools/graphics/nifskope/no-sse-on-arm.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/NifSkope.pro b/NifSkope.pro
index cc29fc5..b17bb6e 100644
--- a/NifSkope.pro
+++ b/NifSkope.pro
@@ -428,13 +428,10 @@ win32 {
# Optimization flags
QMAKE_CXXFLAGS_DEBUG -= -O0 -g
QMAKE_CXXFLAGS_DEBUG *= -Og -g3
- QMAKE_CXXFLAGS_RELEASE *= -O3 -mfpmath=sse
+ QMAKE_CXXFLAGS_RELEASE *= -O3
# C++11 Support
QMAKE_CXXFLAGS_RELEASE *= -std=c++14
-
- # Extension flags
- QMAKE_CXXFLAGS_RELEASE *= -msse2 -msse
}
win32 {