diff options
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/criu/default.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/fatrace/default.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/reptyr/default.nix | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index efca4c7bbb5..f04f6f89760 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3" substituteInPlace ./Makefile --replace "tar-name := $(shell git tag -l v$(CRIU_VERSION))" "tar-name = 2.0" # --replace "-Werror" "" ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto + + # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. + sed 1i'#include <sys/sysmacros.h>' -i criu/include/util.h ''; buildPhase = "make PREFIX=$out"; diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index 09da891a175..f68856f6b86 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace power-usage-report \ --replace "'which'" "'${which}/bin/which'" + + # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. + sed 1i'#include <sys/sysmacros.h>' -i fatrace.c ''; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix index 99f52dc5aed..e017426aed0 100644 --- a/pkgs/os-specific/linux/reptyr/default.nix +++ b/pkgs/os-specific/linux/reptyr/default.nix @@ -7,6 +7,12 @@ stdenv.mkDerivation rec { url = "https://github.com/nelhage/reptyr/archive/reptyr-${version}.tar.gz"; sha256 = "07pfl0rkgm8m3f3jy8r9l2yvnhf8lgllpsk3mh57mhzdxq8fagf7"; }; + + # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. + postPatch = '' + sed 1i'#include <sys/sysmacros.h>' -i platform/linux/linux.c + ''; + makeFlags = ["PREFIX=$(out)"]; meta = { platforms = stdenv.lib.platforms.linux; |