diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-03-20 00:21:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-20 00:21:08 +0200 |
| commit | 63829f0f137bfc8daf65e0a903043ad4bf4a0876 (patch) | |
| tree | 4862f29876d25285f6ecc6326fad6f00f7b381ca | |
| parent | Merge pull request #221776 from r-ryantm/auto-update/checkstyle (diff) | |
| parent | zoneminder: replace /bin/rm with Nix path (diff) | |
| download | nixpkgs-63829f0f137bfc8daf65e0a903043ad4bf4a0876.tar.gz | |
Merge pull request #222025 from peat-psuwit/zoneminder-1.36.33
zoneminder: 1.36.32 -> 1.36.33, replace /bin/rm with Nix path
| -rw-r--r-- | pkgs/servers/zoneminder/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 80ff140122fd..503f7b04cd28 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -57,13 +57,13 @@ let in stdenv.mkDerivation rec { pname = "zoneminder"; - version = "1.36.32"; + version = "1.36.33"; src = fetchFromGitHub { owner = "ZoneMinder"; repo = "zoneminder"; rev = version; - sha256 = "sha256-8iRoGpkpZVOOr0wSY9iey2x4gPfKTfUNtt5TCHCCRIQ="; + sha256 = "sha256-KUhFZrF7BuLB2Z3LnTcHEEZVA6iosam6YsOd8KWvx7E="; fetchSubmodules = true; }; @@ -116,6 +116,12 @@ in stdenv.mkDerivation rec { --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg " 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 \ --replace "'date " "'${coreutils}/bin/date " \ --subst-var-by srcHash "`basename $out`" |