diff options
author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2021-04-20 02:06:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-20 02:06:07 +0200 |
commit | 6b34489f81d82846dd6e9d734869595eb7caa135 (patch) | |
tree | 93f54d464d593d876bf00f609e7bc6eeabeb1430 /pkgs/applications/graphics | |
parent | 6ef7c23763b82a9c816c793c1788b2fd29c3ee0a (diff) | |
parent | fa03ffe4754f22630f65096d154c87d44ff0e71f (diff) | |
download | nixpkgs-6b34489f81d82846dd6e9d734869595eb7caa135.tar nixpkgs-6b34489f81d82846dd6e9d734869595eb7caa135.tar.gz nixpkgs-6b34489f81d82846dd6e9d734869595eb7caa135.tar.bz2 nixpkgs-6b34489f81d82846dd6e9d734869595eb7caa135.tar.lz nixpkgs-6b34489f81d82846dd6e9d734869595eb7caa135.tar.xz nixpkgs-6b34489f81d82846dd6e9d734869595eb7caa135.tar.zst nixpkgs-6b34489f81d82846dd6e9d734869595eb7caa135.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/sane/backends/brscan4/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 9713618d79a..6fcb5830556 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}"; @@ -33,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 @@ -45,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 @@ -79,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; |