From 5858bc26427cadca792d7f9d2bf9e66d77294f92 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Wed, 13 May 2020 20:45:10 +0100 Subject: [PATCH] python2Packages.nixpart0/lvm2: patch for glibc >= 2.28 (cherry picked from commit 0776d9043c6a7335db46f2fde96ef9a08387ef7c) --- pkgs/tools/filesystems/nixpart/0.4/default.nix | 2 +- pkgs/tools/filesystems/nixpart/0.4/lvm2.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 68122eaaf08e0..ce1b4455117de 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -27,7 +27,7 @@ let lvm2 = import ./lvm2.nix { inherit stdenv fetchurl; - inherit (pkgs) pkgconfig utillinux systemd coreutils; + inherit (pkgs) fetchpatch pkgconfig utillinux systemd coreutils; }; multipath_tools = import ./multipath-tools.nix { diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index 804b052b61ae8..b6d7aefe7ce96 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, utillinux, coreutils }: let v = "2.02.106"; @@ -12,6 +12,18 @@ stdenv.mkDerivation { sha256 = "0nr833bl0q4zq52drjxmmpf7bs6kqxwa5kahwwxm9411khkxz0vc"; }; + patches = [ + # Fix build with glibc >= 2.28 + # https://github.com/NixOS/nixpkgs/issues/86403 + (fetchpatch { + url = "https://github.com/lvmteam/lvm2/commit/92d5a8441007f578e000b492cecf67d6b8a87405.patch"; + sha256 = "1yqd6jng0b370k53vks1shg57yhfyribhpmv19km5zsjqf0qqx2d"; + excludes = [ + "libdm/libdm-stats.c" + ]; + }) + ]; + configureFlags = [ "--disable-readline" "--enable-udev_rules"