summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2021-07-18 15:09:50 +0100
committerGitHub <noreply@github.com>2021-07-18 15:09:50 +0100
commitc41fdc54acd90360cbd7fb867fab60d6f7c63923 (patch)
tree575099b5be9b4198ca49b3cdb9625d5a70a6127e
parentMerge pull request #130530 from NixOS/backport-130146-to-release-21.05 (diff)
parentcnijfilter_4_00: fix broken build (diff)
downloadnixpkgs-c41fdc54acd90360cbd7fb867fab60d6f7c63923.tar.gz
Merge pull request #129339 from paumr/backport_cnijfilter_4_00_bugfix
[21.05] cnijfilter_4_00: fix broken build
-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>