diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-06 06:01:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-06 06:01:30 +0000 |
| commit | 035a649a67c56b9d16be608e8bb87b9c215b33da (patch) | |
| tree | cdb7f52fa90bd89fe14628303333ba524f1c49be /pkgs/misc | |
| parent | 2622221e95392f62f81ae60c35504e338e9ac2cf (diff) | |
| parent | bf78e6a54601fc74d8d27fb918a420c84fb6f5b3 (diff) | |
| download | nixlib-035a649a67c56b9d16be608e8bb87b9c215b33da.tar nixlib-035a649a67c56b9d16be608e8bb87b9c215b33da.tar.gz nixlib-035a649a67c56b9d16be608e8bb87b9c215b33da.tar.bz2 nixlib-035a649a67c56b9d16be608e8bb87b9c215b33da.tar.lz nixlib-035a649a67c56b9d16be608e8bb87b9c215b33da.tar.xz nixlib-035a649a67c56b9d16be608e8bb87b9c215b33da.tar.zst nixlib-035a649a67c56b9d16be608e8bb87b9c215b33da.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/cups/0001-TargetConditionals.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/pkgs/misc/cups/0001-TargetConditionals.patch b/pkgs/misc/cups/0001-TargetConditionals.patch deleted file mode 100644 index 42cd4c051d4b..000000000000 --- a/pkgs/misc/cups/0001-TargetConditionals.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1204c841999808ba27267a0039777dcbccdcd6e3 Mon Sep 17 00:00:00 2001 -From: toonn <toonn@toonn.io> -Date: Sun, 27 Jun 2021 12:30:08 +0200 -Subject: [PATCH] TargetConditionals - ---- - test/ippserver.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/test/ippserver.c b/test/ippserver.c -index 38b304f..68ccab1 100644 ---- a/test/ippserver.c -+++ b/test/ippserver.c -@@ -25,7 +25,11 @@ - * Include necessary headers... - */ - --#include <config.h> /* CUPS configuration header */ -+#ifdef __APPLE__ -+# include <xcode/config.h> /* CUPS configuration header macOS */ -+#else -+# include <config.h> /* CUPS configuration header */ -+#endif /* __APPLE__ */ - #include <cups/cups.h> /* Public API */ - #include <cups/string-private.h> /* CUPS string functions */ - #include <cups/thread-private.h> /* For multithreading functions */ --- -2.17.2 (Apple Git-113) - |