diff --git a/pkgs/applications/video/video-trimmer/default.nix b/pkgs/applications/video/video-trimmer/default.nix index 230654d99579..dc96263e9813 100644 --- a/pkgs/applications/video/video-trimmer/default.nix +++ b/pkgs/applications/video/video-trimmer/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , rustPlatform , pkg-config , meson @@ -9,42 +8,34 @@ , desktop-file-utils , blueprint-compiler , ninja -, gobject-introspection , gtk4 , libadwaita , gst_all_1 +, ffmpeg-full }: stdenv.mkDerivation rec { pname = "video-trimmer"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "YaLTeR"; - repo = "video-trimmer"; + repo = pname; rev = "v${version}"; - sha256 = "sha256-D7wjJkdqqjjwwYEUZnNr7hFQK59wfTnaCLXCy+SK8Jo="; + hash = "sha256-0zhQoxzU1GikYP5OwqMl34RsnefJtdZox5EuTqOFnas="; }; + cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-cB5dVrEbISvHrOb87uVZSkT694VKtPtyk+c1tYNCTp0="; + hash = "sha256-kH9AfEskh7TTXF+PZwOZNWVJmnEeMJrSEEuDGyP5A5o="; }; - patches = [ - # https://gitlab.gnome.org/YaLTeR/video-trimmer/-/merge_requests/12 - (fetchpatch { - url = "https://gitlab.gnome.org/YaLTeR/video-trimmer/-/commit/2faf4bb13d44463ea940c39ece9187f76627dbe9.diff"; - sha256 = "sha256-BPjwfFCDIqnS1rAlIinQ982VKdAYLyzDAPLCmPDvdp4="; - }) - ]; - nativeBuildInputs = [ pkg-config meson wrapGAppsHook4 - gobject-introspection desktop-file-utils blueprint-compiler ninja @@ -68,6 +59,12 @@ stdenv.mkDerivation rec { doCheck = true; + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${lib.makeBinPath [ ffmpeg-full ]}" + ) + ''; + meta = with lib; { homepage = "https://gitlab.gnome.org/YaLTeR/video-trimmer"; description = "Trim videos quickly";