diff options
| author | Piotr Bogdan <ppbogdan@gmail.com> | 2020-05-13 21:37:22 +0100 |
|---|---|---|
| committer | Piotr Bogdan <ppbogdan@gmail.com> | 2020-06-10 13:01:34 +0100 |
| commit | 912e1e87c0509d6f75acb33a9c21423eb6bffba6 (patch) | |
| tree | f286d33b77040a677fd929740bcf9d694b43fb6e /pkgs/tools | |
| parent | 64f4073f8d068fe0f226287c2c1045e08e3e7333 (diff) | |
| download | nixpkgs-912e1e87c0509d6f75acb33a9c21423eb6bffba6.tar nixpkgs-912e1e87c0509d6f75acb33a9c21423eb6bffba6.tar.gz nixpkgs-912e1e87c0509d6f75acb33a9c21423eb6bffba6.tar.bz2 nixpkgs-912e1e87c0509d6f75acb33a9c21423eb6bffba6.tar.lz nixpkgs-912e1e87c0509d6f75acb33a9c21423eb6bffba6.tar.xz nixpkgs-912e1e87c0509d6f75acb33a9c21423eb6bffba6.tar.zst nixpkgs-912e1e87c0509d6f75acb33a9c21423eb6bffba6.zip | |
python2Packages.nixpart0/pyblock: patch for glibc >= 2.28
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/pyblock-sysmacros.h.patch | 12 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/pyblock.nix | 6 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock-sysmacros.h.patch b/pkgs/tools/filesystems/nixpart/0.4/pyblock-sysmacros.h.patch new file mode 100644 index 00000000000..b8ab7bd53b2 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/pyblock-sysmacros.h.patch @@ -0,0 +1,12 @@ +diff --git a/dm.c b/dm.c +index 5daa0e5..d5b84c8 100644 +--- a/dm.c ++++ b/dm.c +@@ -19,6 +19,7 @@ + #define _GNU_SOURCE + #include <sys/stat.h> + #include <sys/types.h> ++#include <sys/sysmacros.h> + #include <unistd.h> + #include <fcntl.h> + #include <stdarg.h> diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix index 2abab905737..f087edd853d 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; }; + patches = [ + # Fix build with glibc >= 2.28 + # https://github.com/NixOS/nixpkgs/issues/86403 + ./pyblock-sysmacros.h.patch + ]; + postPatch = '' sed -i -e 's|/usr/include/python|${python}/include/python|' \ -e 's/-Werror *//' -e 's|/usr/|'"$out"'/|' Makefile |