Merge #35113: cups: upstream patch for a bug
This commit is contained in:
commit
e719327694
13
pkgs/misc/cups/cups-clean-dirty.patch
Normal file
13
pkgs/misc/cups/cups-clean-dirty.patch
Normal file
@ -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__
|
@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
|
|||||||
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch?h=packages/cups";
|
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch?h=packages/cups";
|
||||||
sha256 = "1ddgdlg9s0l2ph6l8lx1m1lx6k50gyxqi3qiwr44ppq1rxs80ny5";
|
sha256 = "1ddgdlg9s0l2ph6l8lx1m1lx6k50gyxqi3qiwr44ppq1rxs80ny5";
|
||||||
})
|
})
|
||||||
|
./cups-clean-dirty.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig removeReferencesTo ];
|
nativeBuildInputs = [ pkgconfig removeReferencesTo ];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user