suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

python2Packages.nixpart0/parted: patch for glibc >= 2.28

Browse Source
This commit is contained in:
Piotr Bogdan 2020-05-13 20:46:16 +01:00
parent eb696ef672
commit 64f4073f8d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/filesystems/nixpart/0.4/default.nix
View File

@ -37,7 +37,7 @@ let
parted = import ./parted.nix { parted = import ./parted.nix {
inherit stdenv fetchurl; inherit stdenv fetchurl;
inherit (pkgs) utillinux readline libuuid gettext check lvm2; inherit (pkgs) fetchpatch utillinux readline libuuid gettext check lvm2;
}; };
pyblock = import ./pyblock.nix { pyblock = import ./pyblock.nix {

11
pkgs/tools/filesystems/nixpart/0.4/parted.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lvm2, libuuid, gettext, readline { stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline
, utillinux, check, enableStatic ? false }: , utillinux, check, enableStatic ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y"; 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 ] buildInputs = [ libuuid ]
++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (readline != null) readline
++ stdenv.lib.optional (gettext != null) gettext ++ stdenv.lib.optional (gettext != null) gettext