diff options
author | Robin Gloster <mail@glob.in> | 2021-08-02 17:08:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-02 17:08:40 +0200 |
commit | 15ffca434eb8c47d472c3508abe10616022b31a4 (patch) | |
tree | b0e73ab8b0c835d2a3c6fe6dfecb547d81661cc4 /pkgs/misc/cups/drivers | |
parent | a476da069049bbdd1630ba1bc66e0ba0512cff15 (diff) | |
parent | 5701e5bc3bfb317e1f37ff3fb889eae7584a1206 (diff) | |
download | nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.gz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.bz2 nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.lz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.xz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.zst nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.zip |
Merge branch 'master' into meshcentral
Diffstat (limited to 'pkgs/misc/cups/drivers')
8 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix index 37b39556d93..5dd4c881505 100644 --- a/pkgs/misc/cups/drivers/estudio/default.nix +++ b/pkgs/misc/cups/drivers/estudio/default.nix @@ -11,10 +11,6 @@ stdenv.mkDerivation { buildInputs = [ perl ]; - phases = [ "unpackPhase" - "patchPhase" - "installPhase" ]; - patchPhase = '' patchShebangs lib/ gunzip share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS.gz diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix index d32968cc45c..0b145dfa385 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg makeWrapper ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' dpkg-deb -x $src $out diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix index 0d11579e954..4b60f548aad 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg makeWrapper ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' dpkg-deb -x $src $out diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix index 5d4980da9d1..f30f9abae33 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg makeWrapper ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' dpkg-deb -x $src $out diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix index 2b6c458e745..fabcee4dc02 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg makeWrapper ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' dpkg-deb -x $src $out diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix index ebb2e439298..a7fd86a3169 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg makeWrapper ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' dpkg-deb -x $src $out diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix index 2b5dc44cead..ee9e8a07baa 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg makeWrapper ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' dpkg-deb -x $src $out diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index 1125e769711..eae42124063 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -10,8 +10,6 @@ let sha256 = "1156flics5m9m7a4hdmcc2nphbdyary6dfmbcrmsp9xb7ivsypdl"; }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/share/cups/profiles/samsung cp * $out/share/cups/profiles/samsung/ |