about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel Dionne-Riel <samuel@dionne-riel.com>2020-05-31 02:59:55 -0400
committerGitHub <noreply@github.com>2020-05-31 02:59:55 -0400
commit2defee2981107428aae547773ddcf2cab65d2c6f (patch)
tree1df0279cf19328064278af35902579802995d0f7
parent2d689dca07125a43b74b8c3d7db1fb971249add1 (diff)
parentb70b1835d59f683108e755d254f4f1b1f6427803 (diff)
downloadnixlib-2defee2981107428aae547773ddcf2cab65d2c6f.tar
nixlib-2defee2981107428aae547773ddcf2cab65d2c6f.tar.gz
nixlib-2defee2981107428aae547773ddcf2cab65d2c6f.tar.bz2
nixlib-2defee2981107428aae547773ddcf2cab65d2c6f.tar.lz
nixlib-2defee2981107428aae547773ddcf2cab65d2c6f.tar.xz
nixlib-2defee2981107428aae547773ddcf2cab65d2c6f.tar.zst
nixlib-2defee2981107428aae547773ddcf2cab65d2c6f.zip
Merge pull request #88882 from Kiwi/mlv-app-init
mlv-app: init at 1.11
-rw-r--r--pkgs/applications/video/mlv-app/aarch64-flags.patch13
-rw-r--r--pkgs/applications/video/mlv-app/default.nix62
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 77 insertions, 0 deletions
diff --git a/pkgs/applications/video/mlv-app/aarch64-flags.patch b/pkgs/applications/video/mlv-app/aarch64-flags.patch
new file mode 100644
index 000000000000..b8c025b3b3fc
--- /dev/null
+++ b/pkgs/applications/video/mlv-app/aarch64-flags.patch
@@ -0,0 +1,13 @@
+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{
+
+ # Linux
+ linux-g++*{
+-    QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99
++    QMAKE_CFLAGS += -O3 -fopenmp -march=native -std=c99
+     QMAKE_CXXFLAGS += -fopenmp
+     LIBS += -lgomp
+ }
diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/applications/video/mlv-app/default.nix
new file mode 100644
index 000000000000..757759b1146f
--- /dev/null
+++ b/pkgs/applications/video/mlv-app/default.nix
@@ -0,0 +1,62 @@
+{ fetchFromGitHub
+, lib
+, mkDerivation
+, qmake
+, qtbase
+, qtmultimedia
+, stdenv
+}:
+
+mkDerivation rec {
+  pname = "mlv-app";
+  version = "1.11";
+
+  src = fetchFromGitHub {
+    owner = "ilia3101";
+    repo = "MLV-App";
+    rev = "QTv${version}";
+    sha256 = "0s5sjdxi8a17ddvih4ara7mlb2xrc9xqx52jmhfaca6ng341gi4x";
+  };
+
+  patches = if stdenv.isAarch64 then ./aarch64-flags.patch else null;
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm555 -t $out/bin                mlvapp
+    install -Dm444 -t $out/share/applications mlvapp.desktop
+    install -Dm444 -t $out/share/icons/hicolor/512x512/apps RetinaIMG/MLVAPP.png
+    runHook postInstall
+  '';
+
+  qmakeFlags = [ "MLVApp.pro" ];
+
+  preConfigure = ''
+    export HOME=$TMPDIR
+    cd platform/qt/
+  '';
+
+  buildInputs = [
+    qtmultimedia
+    qtbase
+  ];
+
+  dontWrapQtApps = true;
+
+  preFixup = ''
+    wrapQtApp "$out/bin/mlvapp"
+  '';
+
+  nativeBuildInputs = [
+    qmake
+  ];
+
+  meta = with lib; {
+    description = "All in one MLV processing app that is pretty great";
+    homepage = "https://mlv.app";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [
+      kiwi
+    ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 039c1f78af9f..2f6c5dfea4f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13785,6 +13785,8 @@ in
 
   mlt = callPackage ../development/libraries/mlt { ffmpeg = ffmpeg_4; };
 
+  mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { };
+
   mono-addins = callPackage ../development/libraries/mono-addins { };
 
   movit = callPackage ../development/libraries/movit { };