diff --git a/pkgs/by-name/mf/mfcl8690cdwcupswrapper/package.nix b/pkgs/by-name/mf/mfcl8690cdwcupswrapper/package.nix index f18bec338f8a..932d22569e0c 100644 --- a/pkgs/by-name/mf/mfcl8690cdwcupswrapper/package.nix +++ b/pkgs/by-name/mf/mfcl8690cdwcupswrapper/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "mfcl8690cdwcupswrapper"; - version = "1.4.0-0"; + version = "1.5.0-3"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf103250/${pname}-${version}.i386.deb"; - sha256 = "1bl9r8mmj4vnanwpfjqgq3c9lf2v46wp5k6r2n9iqprf7ldd1kb2"; + url = "https://download.brother.com/welcome/dlf103250/mfcl8690cdwcupswrapper-${version}.i386.deb"; + hash = "sha256-CREQRr4nhw1pD+8AfD5p/EHpx3R6vQIO8h6VtnHxXls="; }; nativeBuildInputs = [ @@ -56,9 +56,11 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L8690CDW CUPS wrapper driver"; - homepage = "http://www.brother.com/"; + homepage = "https://www.brother.com/"; license = lib.licenses.unfree; platforms = lib.platforms.linux; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + nick-linux + ]; }; } diff --git a/pkgs/by-name/mf/mfcl8690cdwlpr/package.nix b/pkgs/by-name/mf/mfcl8690cdwlpr/package.nix index bcdb8a2ce67b..86fea82dda43 100644 --- a/pkgs/by-name/mf/mfcl8690cdwlpr/package.nix +++ b/pkgs/by-name/mf/mfcl8690cdwlpr/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "mfcl8690cdwlpr"; - version = "1.3.0-0"; + version = "1.5.0-3"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf103241/${pname}-${version}.i386.deb"; - sha256 = "0x8zd4b1psmw1znp2ibncs37xm5mljcy9yza2rx8jm8lp0a3l85v"; + url = "https://download.brother.com/welcome/dlf103241/mfcl8690cdwlpr-${version}.i386.deb"; + hash = "sha256-CXYo6ISUr0hFiHRVRnXbJ/21dK/2NUrCt2bnzQuHOXI="; }; nativeBuildInputs = [ @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { ]; dontUnpack = true; + dontPatchELF = true; installPhase = '' dpkg-deb -x $src $out @@ -37,9 +38,9 @@ stdenv.mkDerivation rec { filter=$dir/lpd/filter_mfcl8690cdw substituteInPlace $filter \ - --replace /usr/bin/perl ${perl}/bin/perl \ - --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir/\"; #" \ - --replace "PRINTER =~" "PRINTER = \"mfcl8690cdw\"; #" + --replace-fail /usr/bin/perl ${perl}/bin/perl \ + --replace-fail "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir/\"; #" \ + --replace-fail "PRINTER =~" "PRINTER = \"mfcl8690cdw\"; #" wrapProgram $filter \ --prefix PATH : ${ @@ -53,17 +54,22 @@ stdenv.mkDerivation rec { ] } - # need to use i686 glibc here, these are 32bit proprietary binaries - interpreter=${pkgs.pkgsi686Linux.glibc}/lib/ld-linux.so.2 - patchelf --set-interpreter "$interpreter" $dir/lpd/brmfcl8690cdwfilter + # Adding x86_64 binaries + for file in $dir/lpd/x86_64/brmfcl8690cdwfilter $dir/lpd/x86_64/brprintconf_mfcl8690cdw; do + patchelf --set-interpreter \ + ${pkgs.pkgsi686Linux.glibc}/lib/ld-linux.so.2 \ + $file + done ''; meta = { description = "Brother MFC-L8690CDW LPR printer driver"; - homepage = "http://www.brother.com/"; + homepage = "https://www.brother.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + nick-linux + ]; platforms = [ "x86_64-linux" "i686-linux"