Merge pull request #129339 from paumr/backport_cnijfilter_4_00_bugfix

[21.05] cnijfilter_4_00: fix broken build
2021-07-18 15:09:50 +01:00 · 2021-07-18 15:09:50 +01:00 · c41fdc54ac
commit c41fdc54ac
parent e80a619241 340976f347
2 changed files with 11 additions and 0 deletions
--- 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 = ''
--- 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
@ -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>