summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaumr <paum@bdisk.eu>2021-07-05 12:01:31 +0200
committerpaumr <paum@bdisk.eu>2021-07-05 18:25:41 +0200
commit340976f347a3e8d480c02ebe8042492609bffb6b (patch)
tree41393215088b0c8d0dd13f2eb32cee1f93882f1e
parentnixos/hamster: fix programs.hamster.enable text (diff)
downloadnixpkgs-340976f347a3e8d480c02ebe8042492609bffb6b.tar.gz
cnijfilter_4_00: fix broken build
30286ebcc178aec1fb3797ba3ec88cf75feb282b updated glibc to 2.32. This removed the deprecated <sys/sysctl.h> header, which caused a build error on this package. Since this header doesn't seem to be required it was removed with this patch. (cherry picked from commit c9f2aeec17719d009d764e58e573e974212e7b10)
-rw-r--r--pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix1
-rw-r--r--pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch10
2 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
index f6504b598cb0..1f0f7ab6e91d 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
@@ -41,6 +41,7 @@ in stdenv.mkDerivation {
./patches/cnijfilter-4.00-4-ppd.patch
./patches/cnijfilter-4.00-5-abi_x86_32.patch
./patches/cnijfilter-4.00-6-headers.patch
+ ./patches/cnijfilter-4.00-7-sysctl.patch
];
postPatch = ''
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch b/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch
new file mode 100644
index 000000000000..a28ca208492b
--- /dev/null
+++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch
@@ -0,0 +1,10 @@
+--- a/cnijnpr/src/cnijnpr.c
++++ b/cnijnpr/src/cnijnpr.c
+@@ -33,7 +33,6 @@
+ #include <signal.h>
+ #include <sys/ioctl.h>
+ #include <net/if.h>
+-#include <sys/sysctl.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <config.h>