diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-24 13:25:39 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-24 22:30:18 +0100 |
commit | e719327694b7b7f68bd5938003516338df138082 (patch) | |
tree | 37a87abb87403753da63bfb05ecc1441f0078ab3 /pkgs | |
parent | 753db3e2d063f4f2bd4d50dedd1386b8e9d66ab2 (diff) | |
parent | 965ddac92fe59b4ed3d39d214732c239b8186019 (diff) | |
download | nixlib-e719327694b7b7f68bd5938003516338df138082.tar nixlib-e719327694b7b7f68bd5938003516338df138082.tar.gz nixlib-e719327694b7b7f68bd5938003516338df138082.tar.bz2 nixlib-e719327694b7b7f68bd5938003516338df138082.tar.lz nixlib-e719327694b7b7f68bd5938003516338df138082.tar.xz nixlib-e719327694b7b7f68bd5938003516338df138082.tar.zst nixlib-e719327694b7b7f68bd5938003516338df138082.zip |
Merge #35113: cups: upstream patch for a bug
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/misc/cups/cups-clean-dirty.patch | 13 | ||||
-rw-r--r-- | pkgs/misc/cups/default.nix | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/misc/cups/cups-clean-dirty.patch b/pkgs/misc/cups/cups-clean-dirty.patch new file mode 100644 index 000000000000..0bdc8198e8fb --- /dev/null +++ b/pkgs/misc/cups/cups-clean-dirty.patch @@ -0,0 +1,13 @@ +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 3e215cba101c..a82afc1e472c 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch?h=packages/cups"; sha256 = "1ddgdlg9s0l2ph6l8lx1m1lx6k50gyxqi3qiwr44ppq1rxs80ny5"; }) + ./cups-clean-dirty.patch ]; nativeBuildInputs = [ pkgconfig removeReferencesTo ]; |