diff options
| author | Piotr Bogdan <ppbogdan@gmail.com> | 2020-05-13 20:46:16 +0100 |
|---|---|---|
| committer | Piotr Bogdan <ppbogdan@gmail.com> | 2020-06-10 13:01:34 +0100 |
| commit | 64f4073f8d068fe0f226287c2c1045e08e3e7333 (patch) | |
| tree | 6fea94df269ababcf3fb8b92062aa01a98b68e34 | |
| parent | eb696ef672716567c8e1c22675ac4b53352e8dfb (diff) | |
| download | nixpkgs-64f4073f8d068fe0f226287c2c1045e08e3e7333.tar nixpkgs-64f4073f8d068fe0f226287c2c1045e08e3e7333.tar.gz nixpkgs-64f4073f8d068fe0f226287c2c1045e08e3e7333.tar.bz2 nixpkgs-64f4073f8d068fe0f226287c2c1045e08e3e7333.tar.lz nixpkgs-64f4073f8d068fe0f226287c2c1045e08e3e7333.tar.xz nixpkgs-64f4073f8d068fe0f226287c2c1045e08e3e7333.tar.zst nixpkgs-64f4073f8d068fe0f226287c2c1045e08e3e7333.zip | |
python2Packages.nixpart0/parted: patch for glibc >= 2.28
| -rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/parted.nix | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 6512c21a861..1f672701d38 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -37,7 +37,7 @@ let parted = import ./parted.nix { inherit stdenv fetchurl; - inherit (pkgs) utillinux readline libuuid gettext check lvm2; + inherit (pkgs) fetchpatch utillinux readline libuuid gettext check lvm2; }; pyblock = import ./pyblock.nix { diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix index 2a0ffe326dc..16f3a57ea14 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lvm2, libuuid, gettext, readline +{ stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline , utillinux, check, enableStatic ? false }: stdenv.mkDerivation rec { @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y"; }; + patches = [ + # Fix build with glibc >= 2.28 + # https://github.com/NixOS/nixpkgs/issues/86403 + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-block/parted/files/parted-3.2-sysmacros.patch?id=8e2414f551c14166f259f9a25a594aec7a5b9ea0"; + sha256 = "0fdgifjbri7n28hv74zksac05gw72p2czzvyar0jp62b9dnql3mp"; + }) + ]; + buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext |