dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #222025 from peat-psuwit/zoneminder-1.36.33

Browse Source 
zoneminder: 1.36.32 -> 1.36.33, replace /bin/rm with Nix path
This commit is contained in:
Weijia Wang 2023-03-20 00:21:08 +02:00 committed by GitHub
commit 63829f0f13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/servers/zoneminder/default.nix
View File

@ -57,13 +57,13 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "zoneminder"; pname = "zoneminder";
version = "1.36.32"; version = "1.36.33";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ZoneMinder"; owner = "ZoneMinder";
repo = "zoneminder"; repo = "zoneminder";
rev = version; rev = version;
sha256 = "sha256-8iRoGpkpZVOOr0wSY9iey2x4gPfKTfUNtt5TCHCCRIQ="; sha256 = "sha256-KUhFZrF7BuLB2Z3LnTcHEEZVA6iosam6YsOd8KWvx7E=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -116,6 +116,12 @@ in stdenv.mkDerivation rec {
--replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg " --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg "
done done
for f in scripts/ZoneMinder/lib/ZoneMinder/Event.pm \
scripts/ZoneMinder/lib/ZoneMinder/Storage.pm ; do
substituteInPlace $f \
--replace '/bin/rm' "${coreutils}/bin/rm"
done
substituteInPlace web/includes/functions.php \ substituteInPlace web/includes/functions.php \
--replace "'date " "'${coreutils}/bin/date " \ --replace "'date " "'${coreutils}/bin/date " \
--subst-var-by srcHash "`basename $out`" --subst-var-by srcHash "`basename $out`"