From 1a0240b6b504c5103a2cdde86a3c91efbc0cef13 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Mon, 21 Apr 2025 20:09:50 -0700 Subject: [PATCH] mlv-app: modernize --- pkgs/applications/video/mlv-app/default.nix | 52 ++++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/applications/video/mlv-app/default.nix index cfdd4f61e905..a854a06ac587 100644 --- a/pkgs/applications/video/mlv-app/default.nix +++ b/pkgs/applications/video/mlv-app/default.nix @@ -1,23 +1,21 @@ { - fetchFromGitHub, lib, - mkDerivation, - fetchpatch, - qmake, - qtbase, - qtmultimedia, stdenv, + fetchFromGitHub, + fetchpatch, + libsForQt5, + writableTmpDirAsHomeHook, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mlv-app"; version = "1.15"; src = fetchFromGitHub { owner = "ilia3101"; repo = "MLV-App"; - rev = "QTv${version}"; - sha256 = "sha256-boYnIGDowV4yRxdE98U5ngeAwqi5HTRDFh5gVwW/kN8="; + rev = "QTv${finalAttrs.version}"; + hash = "sha256-boYnIGDowV4yRxdE98U5ngeAwqi5HTRDFh5gVwW/kN8="; }; patches = [ @@ -27,24 +25,20 @@ mkDerivation rec { }) ]; - 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/ ''; + nativeBuildInputs = [ + libsForQt5.wrapQtAppsHook + libsForQt5.qmake + writableTmpDirAsHomeHook + ]; buildInputs = [ - qtmultimedia - qtbase + libsForQt5.qtmultimedia + libsForQt5.qtbase ]; dontWrapQtApps = true; @@ -53,16 +47,22 @@ mkDerivation rec { wrapQtApp "$out/bin/mlvapp" ''; - nativeBuildInputs = [ - qmake - ]; + 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 + ''; - meta = with lib; { + meta = { description = "All in one MLV processing app that is pretty great"; homepage = "https://mlv.app"; - license = licenses.gpl3; + downloadPage = "https://github.com/ilia3101/MLV-App"; + changelog = "https://github.com/ilia3101/MLV-App/releases/tag/QTv${finalAttrs.version}"; + license = lib.licenses.gpl3; maintainers = [ ]; platforms = [ "x86_64-linux" ]; mainProgram = "mlvapp"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6be7b7913055..dca6413946d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10549,7 +10549,7 @@ with pkgs; mlt = darwin.apple_sdk_11_0.callPackage ../development/libraries/mlt { }; - mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { }; + mlv-app = callPackage ../applications/video/mlv-app { }; mpeg2dec = libmpeg2;