diff options
| author | Peter Simons <simons@cryp.to> | 2012-11-21 16:31:32 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-11-21 16:31:32 +0100 |
| commit | 15e2bf605012c28a7ba587d37a2bed9824c2ad17 (patch) | |
| tree | 5b8b4f1dd05db19736434ed1ecb061b7c67c60d9 /pkgs/os-specific/linux/busybox | |
| parent | f67d5a9a39c658ba38ce4efd3968fb76ed97ac70 (diff) | |
| download | nixlib-15e2bf605012c28a7ba587d37a2bed9824c2ad17.tar nixlib-15e2bf605012c28a7ba587d37a2bed9824c2ad17.tar.gz nixlib-15e2bf605012c28a7ba587d37a2bed9824c2ad17.tar.bz2 nixlib-15e2bf605012c28a7ba587d37a2bed9824c2ad17.tar.lz nixlib-15e2bf605012c28a7ba587d37a2bed9824c2ad17.tar.xz nixlib-15e2bf605012c28a7ba587d37a2bed9824c2ad17.tar.zst nixlib-15e2bf605012c28a7ba587d37a2bed9824c2ad17.zip | |
busybox: fix build by adding a missing <sys/resource.h> include
This patch is going to be in the next release: http://lists.busybox.net/pipermail/busybox/2012-May/077766.html
Diffstat (limited to 'pkgs/os-specific/linux/busybox')
| -rw-r--r-- | pkgs/os-specific/linux/busybox/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/busybox/include-missing-sys-resource-header.patch | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 0848cb332534..30f7341257bd 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -44,6 +44,9 @@ stdenv.mkDerivation rec { sha256 = "10k8kgrprll9hxfm9gc3jl7kkq79g6l2pygn5snqwqg5v80zy4zb"; }; + # Remove this patch after the next busybox update. + patches = [ ./include-missing-sys-resource-header.patch ]; + configurePhase = '' make defconfig ${configParser} diff --git a/pkgs/os-specific/linux/busybox/include-missing-sys-resource-header.patch b/pkgs/os-specific/linux/busybox/include-missing-sys-resource-header.patch new file mode 100644 index 000000000000..8163a86e3cdb --- /dev/null +++ b/pkgs/os-specific/linux/busybox/include-missing-sys-resource-header.patch @@ -0,0 +1,12 @@ +diff --git a/include/libbb.h b/include/libbb.h +index f12800f..e7806c2 100644 +--- a/include/libbb.h ++++ b/include/libbb.h +@@ -40,6 +40,7 @@ + #include <sys/poll.h> + #include <sys/ioctl.h> + #include <sys/mman.h> ++#include <sys/resource.h> + #include <sys/socket.h> + #include <sys/stat.h> + #include <sys/time.h> |