Unverified Commit 63829f0f authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

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

zoneminder: 1.36.32 -> 1.36.33, replace /bin/rm with Nix path
parents 100f53a1 2a6fe23b

pkgs/servers/zoneminder/default.nix

+8 −2
Original line number Diff line number Diff line
@@ -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`"