mlv-app: fix aarch64 patch (#352995)

NixOS · Nov 2, 2024 · 7b1cffd · 7b1cffd
2 parents 1f49286 + 14b06b7
commit 7b1cffd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/pkgs/applications/video/mlv-app/aarch64-flags.patch b/pkgs/applications/video/mlv-app/aarch64-flags.patch
@@ -2,12 +2,12 @@ diff --git a/platform/qt/MLVApp.pro b/platform/qt/MLVApp.pro
 index ebdc552..3e37573 100644
 --- a/platform/qt/MLVApp.pro
 +++ b/platform/qt/MLVApp.pro
-@@ -84,7 +84,7 @@ win32{
+@@ -120,7 +120,7 @@ win32{
 
  # Linux
  linux-g++*{
--    QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99
-+    QMAKE_CFLAGS += -O3 -fopenmp -std=c99
-     QMAKE_CXXFLAGS += -fopenmp
+-    QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99 -ftree-vectorize
++    QMAKE_CFLAGS += -O3 -fopenmp -std=c99 -ftree-vectorize
+     QMAKE_CXXFLAGS += -fopenmp -std=c++11 -ftree-vectorize
      LIBS += -lgomp
  }
diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/applications/video/mlv-app/default.nix
@@ -18,7 +18,10 @@ mkDerivation rec {
     sha256 = "sha256-RfZXHmWSjZBxNFwQ/bzHppsLS0LauURIdnkAzxAIBcU=";
   };
 
-  patches = if stdenv.hostPlatform.isAarch64 then ./aarch64-flags.patch else null;
+  patches = lib.optionals stdenv.hostPlatform.isAarch64 [
+    # remove optimization flags with x86 only instruction sets
+    ./aarch64-flags.patch
+  ];
 
   installPhase = ''
     runHook preInstall