diff options
| author | Piotr Bogdan <ppbogdan@gmail.com> | 2020-05-13 20:45:58 +0100 |
|---|---|---|
| committer | Piotr Bogdan <ppbogdan@gmail.com> | 2020-06-10 13:01:33 +0100 |
| commit | eb696ef672716567c8e1c22675ac4b53352e8dfb (patch) | |
| tree | e8f75cff054aa5ed0d5cf089eed07371921bf8d9 | |
| parent | 0776d9043c6a7335db46f2fde96ef9a08387ef7c (diff) | |
| download | nixpkgs-eb696ef672716567c8e1c22675ac4b53352e8dfb.tar nixpkgs-eb696ef672716567c8e1c22675ac4b53352e8dfb.tar.gz nixpkgs-eb696ef672716567c8e1c22675ac4b53352e8dfb.tar.bz2 nixpkgs-eb696ef672716567c8e1c22675ac4b53352e8dfb.tar.lz nixpkgs-eb696ef672716567c8e1c22675ac4b53352e8dfb.tar.xz nixpkgs-eb696ef672716567c8e1c22675ac4b53352e8dfb.tar.zst nixpkgs-eb696ef672716567c8e1c22675ac4b53352e8dfb.zip | |
python2Packages.nixpart0/multipath_tools: 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/multipath-tools.nix | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index ce1b4455117..6512c21a861 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -32,7 +32,7 @@ let multipath_tools = import ./multipath-tools.nix { inherit stdenv fetchurl lvm2; - inherit (pkgs) readline systemd libaio gzip; + inherit (pkgs) fetchpatch readline systemd libaio gzip; }; parted = import ./parted.nix { diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix index b3b18579334..14f179386cf 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -1,6 +1,6 @@ # FIXME: unify with pkgs/os-specific/linux/multipath-tools/default.nix. -{ stdenv, fetchurl, lvm2, libaio, gzip, readline, systemd }: +{ stdenv, fetchurl, fetchpatch, lvm2, libaio, gzip, readline, systemd }: stdenv.mkDerivation rec { name = "multipath-tools-0.4.9"; @@ -10,6 +10,18 @@ stdenv.mkDerivation rec { sha256 = "04n7kazp1zrlqfza32phmqla0xkcq4zwn176qff5ida4a60whi4d"; }; + 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-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch?id=eb22b954c177b5c1e2b6ed5c7cdd02f40f40d757"; + sha256 = "1an0cgmz7g03c4qjimhpm9fcf2iswws18lwqxi688k87qm3xb5qd"; + excludes = [ + "libmultipath/util.c" + ]; + }) + ]; + sourceRoot = "."; buildInputs = [ lvm2 libaio readline gzip ]; |