diff options
| author | Piotr Bogdan <ppbogdan@gmail.com> | 2020-05-13 20:43:02 +0100 |
|---|---|---|
| committer | Piotr Bogdan <ppbogdan@gmail.com> | 2020-06-10 13:01:33 +0100 |
| commit | c494fc51dc44a192d07aec9c67e4a44eca11160a (patch) | |
| tree | 25f672b42d7a8093a0c6d532ee5d16f3438e710f /pkgs/tools/filesystems | |
| parent | 2c79d7f0c22e79398e67c33054b8d9938b60830e (diff) | |
| download | nixpkgs-c494fc51dc44a192d07aec9c67e4a44eca11160a.tar nixpkgs-c494fc51dc44a192d07aec9c67e4a44eca11160a.tar.gz nixpkgs-c494fc51dc44a192d07aec9c67e4a44eca11160a.tar.bz2 nixpkgs-c494fc51dc44a192d07aec9c67e4a44eca11160a.tar.lz nixpkgs-c494fc51dc44a192d07aec9c67e4a44eca11160a.tar.xz nixpkgs-c494fc51dc44a192d07aec9c67e4a44eca11160a.tar.zst nixpkgs-c494fc51dc44a192d07aec9c67e4a44eca11160a.zip | |
python2Packages.nixpart0/cryptsetup: patch for glibc >= 2.28
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix | 11 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/default.nix | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index 3feed238880..88a1716a0e1 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -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"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 5d7a9dd14ec..68122eaaf08 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -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 { |