b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Piotr Bogdan 2020-05-13 20:43:02 +01:00
parent 2c79d7f0c2
commit c494fc51dc
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lvm2, libgcrypt, libuuid, pkgconfig, popt
{ stdenv, fetchurl, fetchpatch, lvm2, libgcrypt, libuuid, pkgconfig, popt
, enablePython ? true, python ? null
}:
@ -12,6 +12,15 @@ stdenv.mkDerivation rec {
sha256 = "1n1qk5chyjspbiianrdb55fhb4wl0vfyqz2br05vfb24v4qlgbx2";
};
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/cryptsetup/files/cryptsetup-1.7.1-sysmacros.patch?id=d72316f97ebcc7fe622b21574442a9ac59b9115f";
sha256 = "0xbhazgl44bimqhcrhajk016w9wi7bkrgwyfq13xmrvyrllqvgdx";
})
];
configureFlags = [ "--enable-cryptsetup-reencrypt" ]
++ stdenv.lib.optional enablePython "--enable-python";

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

@ -18,7 +18,7 @@ let
cryptsetup = import ./cryptsetup.nix {
inherit stdenv fetchurl python;
inherit (pkgs) pkgconfig libgcrypt libuuid popt lvm2;
inherit (pkgs) fetchpatch pkgconfig libgcrypt libuuid popt lvm2;
};
dmraid = import ./dmraid.nix {