From f907aadb1d8e5356c4d06867257e41507d4ba222 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Sun, 18 Apr 2021 19:46:14 +0200 Subject: [PATCH 1/2] brscan4: 0.4.9-1 -> 0.4.10-1 --- .../graphics/sane/backends/brscan4/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 9713618d79a..1959713dbe5 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -11,16 +11,15 @@ let in stdenv.mkDerivation rec { pname = "brscan4"; - version = "0.4.9-1"; + version = "0.4.10-1"; src = { "i686-linux" = fetchurl { url = "http://download.brother.com/welcome/dlf006646/${pname}-${version}.i386.deb"; - sha256 = "0pkg9aqvnkpjnb9cgzf7lxw2g4jqrf2w98irkv22r0gfsfs3nwma"; + sha256 = "sha256-ymIAg+rfSYP5uzsAM1hUYZacJ0PXmKEoljNtb0pgGMw="; }; "x86_64-linux" = fetchurl { - url = "https://download.brother.com/welcome/dlf006645/${pname}-${version}.amd64.deb"; - sha256 = "0kakkl8rmsi2yr3f8vd1kk8vsl9g2ijhqil1cvvbwrhwgi0b7ai7"; + sha256 = "sha256-Gpr5456MCNpyam3g2qPo7S3aEZFMaUGR8bu7YmRY8xk="; }; }."${stdenv.hostPlatform.system}"; From d8a256010a1898e3da5fa5ed269a4eeb2e502c98 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Mon, 19 Apr 2021 21:01:56 +0200 Subject: [PATCH 2/2] brscan4: minor improvments --- pkgs/applications/graphics/sane/backends/brscan4/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 1959713dbe5..6fcb5830556 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb-compat-0_1 ]; dontBuild = true; - patchPhase = '' + postPatch = '' ${myPatchElf "opt/brother/scanner/brscan4/brsaneconfig4"} RPATH=${libusb-compat-0_1.out}/lib @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { ''; installPhase = with lib; '' + runHook preInstall PATH_TO_BRSCAN4="opt/brother/scanner/brscan4" mkdir -p $out/$PATH_TO_BRSCAN4 cp -rp $PATH_TO_BRSCAN4/* $out/$PATH_TO_BRSCAN4 @@ -78,6 +79,7 @@ stdenv.mkDerivation rec { mkdir -p $out/etc/udev/rules.d cp -p ${udevRules}/etc/udev/rules.d/*.rules \ $out/etc/udev/rules.d + runHook postInstall ''; dontStrip = true;