diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix index 4cb0f099e08f0..be7175ce08bd5 100644 --- a/pkgs/by-name/za/zapret/package.nix +++ b/pkgs/by-name/za/zapret/package.nix @@ -15,38 +15,44 @@ stdenv.mkDerivation { pname = "zapret"; - version = "0-unstable-2024-08-01"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "bol-van"; repo = "zapret"; - rev = "9cf72b7c68f6a7c80dfddc6c1cf6d6db32718376"; - hash = "sha256-8cqKCNYLLkZXlwrybKUPG6fLd7gmf8zV9tjWoTxAwIY="; + rev = "d760093f52c02c05177dc0ba66aa833179a489e5"; + hash = "sha256-cIZsTK1SuI/YfN8oDb/nBmPA5d3QhWzKSEzn5wEcadc="; }; buildInputs = [ libcap zlib libnetfilter_queue libnfnetlink ]; nativeBuildInputs = [ iptables nftables gawk ]; buildPhase = '' + runHook preBuild + mkdir -p $out/bin make TGT=$out/bin + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/usr/share/zapret/init.d/sysv mkdir -p $out/usr/share/docs cp $src/blockcheck.sh $out/bin/blockcheck substituteInPlace $out/bin/blockcheck \ - --replace "ZAPRET_BASE=\"\$EXEDIR\"" "ZAPRET_BASE=$out/usr/share/zapret" + --replace-fail '$(cd "$EXEDIR"; pwd)' "$out/usr/share/zapret" cp $src/init.d/sysv/functions $out/usr/share/zapret/init.d/sysv/functions cp $src/init.d/sysv/zapret $out/usr/share/zapret/init.d/sysv/init.d substituteInPlace $out/usr/share/zapret/init.d/sysv/functions \ - --replace "ZAPRET_BASE=\$(readlink -f \"\$EXEDIR/../..\")" "ZAPRET_BASE=$out/usr/share/zapret" + --replace-fail "/opt/zapret" "\"$out/usr/share/zapret\"" touch $out/usr/share/zapret/config @@ -57,6 +63,8 @@ stdenv.mkDerivation { cp $src/common/* $out/usr/share/zapret/common cp $src/ipset/* $out/usr/share/zapret/ipset + rm -f $out/usr/share/zapret/ipset/zapret-hosts-user-exclude.txt.default + mkdir -p $out/usr/share/zapret/nfq ln -s ../../../../bin/nfqws $out/usr/share/zapret/nfq/nfqws @@ -67,6 +75,8 @@ stdenv.mkDerivation { done ln -s ../usr/share/zapret/init.d/sysv/init.d $out/bin/zapret + + runHook postInstall ''; meta = with lib; {