From ec040d9b2206e60e1dc86dbfab3b1942490f3c48 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 5 Dec 2018 18:31:21 -0600 Subject: [PATCH] cups: drop patches (cherry picked from commit 085a74cb42074384958c23bd762af589da570042) --- pkgs/misc/cups/cups-clean-dirty.patch | 13 ------------- pkgs/misc/cups/default.nix | 10 ---------- 2 files changed, 23 deletions(-) delete mode 100644 pkgs/misc/cups/cups-clean-dirty.patch diff --git a/pkgs/misc/cups/cups-clean-dirty.patch b/pkgs/misc/cups/cups-clean-dirty.patch deleted file mode 100644 index 0bdc8198e8f..00000000000 --- a/pkgs/misc/cups/cups-clean-dirty.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/scheduler/main.c b/scheduler/main.c -index 8925c8373..acf031684 100644 ---- a/scheduler/main.c -+++ b/scheduler/main.c -@@ -893,7 +893,7 @@ main(int argc, /* I - Number of command-line args */ - * Write dirty config/state files... - */ - -- if (DirtyCleanTime && current_time >= DirtyCleanTime && cupsArrayCount(Clients) == 0) -+ if (DirtyCleanTime && current_time >= DirtyCleanTime) - cupsdCleanDirty(); - - #ifdef __APPLE__ diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index df2d94c1f89..e3649bb821b 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -21,16 +21,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "man" ]; - patches = [ - (fetchpatch { - name = "cups"; # weird name to avoid change (for now) - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch" - + "?h=packages/cups&id=41fefa22ac518"; - sha256 = "1ddgdlg9s0l2ph6l8lx1m1lx6k50gyxqi3qiwr44ppq1rxs80ny5"; - }) - ./cups-clean-dirty.patch - ]; - postPatch = '' substituteInPlace cups/testfile.c \ --replace 'cupsFileFind("cat", "/bin' 'cupsFileFind("cat", "${coreutils}/bin'