From 62f5b273a0b7fcfd1fdd726f671ae3d63aed8136 Mon Sep 17 00:00:00 2001 From: yuannan Date: Mon, 27 Oct 2025 11:56:36 +0000 Subject: [PATCH] svp: 4.6.263 -> 4.7.305 --- pkgs/by-name/sv/svp/package.nix | 66 ++++++++++++++++----------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/sv/svp/package.nix b/pkgs/by-name/sv/svp/package.nix index ccfa44fb24ce..da8f22499b6c 100644 --- a/pkgs/by-name/sv/svp/package.nix +++ b/pkgs/by-name/sv/svp/package.nix @@ -1,26 +1,23 @@ { stdenv, + lib, buildFHSEnv, writeShellScriptBin, fetchurl, callPackage, makeDesktopItem, copyDesktopItems, - ffmpeg, - glibc, - jq, - lib, - libmediainfo, - libsForQt5, - libusb1, - ocl-icd, - p7zip, - patchelf, socat, + jq, + kdePackages, + ffmpeg, + libmediainfo, + libusb1, vapoursynth, - xdg-utils, xorg, - zenity, + systemdLibs, + openssl, + p7zip, }: let mpvForSVP = callPackage ./mpv.nix { }; @@ -39,49 +36,50 @@ let done ''; + # SVP expects findmnt to return path to storage device for software protection. + # Workaround for tmp-as-root and encrypted root use cases, by returning first storage device on system. + fakeFindmnt = writeShellScriptBin "findmnt" '' + find /dev/ -name 'nvme*n*p*' -or -name 'sd*' -or -name 'vd*' 2>/dev/null | sort | head -n1 + ''; + libraries = [ - fakeLsof - ffmpeg.bin - glibc - zenity - libmediainfo - libsForQt5.qtbase - libsForQt5.qtwayland - libsForQt5.qtdeclarative - libsForQt5.qtscript - libsForQt5.qtsvg - libusb1 mpvForSVP - ocl-icd + fakeLsof + fakeFindmnt (lib.getLib stdenv.cc.cc) + kdePackages.qtbase + kdePackages.qtdeclarative + ffmpeg.bin + libmediainfo + libusb1 vapoursynth - xdg-utils xorg.libX11 + systemdLibs + openssl ]; - svp-dist = stdenv.mkDerivation rec { + svp-dist = stdenv.mkDerivation (finalAttrs: { pname = "svp-dist"; - version = "4.6.263"; + version = "4.7.305"; src = fetchurl { - url = "https://www.svp-team.com/files/svp4-linux.${version}.tar.bz2"; - sha256 = "sha256-HyRDVFHVmTan/Si3QjGQpC3za30way10d0Hk79oXG98="; + url = "https://www.svp-team.com/files/svp4-linux.${finalAttrs.version}.tar.bz2"; + hash = "sha256-PWAcm/hIA4JH2QtJPP+gSJdJLRdfdbZXIVdWELazbxQ="; }; nativeBuildInputs = [ p7zip - patchelf ]; dontFixup = true; unpackPhase = '' - tar xf ${src} + tar xf ${finalAttrs.src} ''; buildPhase = '' mkdir installer - LANG=C grep --only-matching --byte-offset --binary --text $'7z\xBC\xAF\x27\x1C' "svp4-linux-64.run" | + LANG=C grep --only-matching --byte-offset --binary --text $'7z\xBC\xAF\x27\x1C' "svp4-linux.run" | cut -f1 -d: | - while read ofs; do dd if="svp4-linux-64.run" bs=1M iflag=skip_bytes status=none skip=$ofs of="installer/bin-$ofs.7z"; done + while read ofs; do dd if="svp4-linux.run" bs=1M iflag=skip_bytes status=none skip=$ofs of="installer/bin-$ofs.7z"; done ''; installPhase = '' @@ -96,7 +94,7 @@ let done rm -f $out/opt/{add,remove}-menuitem.sh ''; - }; + }); fhs = buildFHSEnv { pname = "SVPManager";