diff options
author | Yegor Timoshenko <yegortimoshenko@riseup.net> | 2018-06-15 23:20:53 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-15 23:20:53 +0000 |
commit | 397f5c37df025e561b0cc94e71077fa0a06679f6 (patch) | |
tree | d25f56fada0a2431203f2dcec8172cd9c64f5080 /pkgs/os-specific/linux/cryptsetup/default.nix | |
parent | d72f22607acd26c04f4447f3db99946aa15f9fe2 (diff) | |
download | nixpkgs-397f5c37df025e561b0cc94e71077fa0a06679f6.tar nixpkgs-397f5c37df025e561b0cc94e71077fa0a06679f6.tar.gz nixpkgs-397f5c37df025e561b0cc94e71077fa0a06679f6.tar.bz2 nixpkgs-397f5c37df025e561b0cc94e71077fa0a06679f6.tar.lz nixpkgs-397f5c37df025e561b0cc94e71077fa0a06679f6.tar.xz nixpkgs-397f5c37df025e561b0cc94e71077fa0a06679f6.tar.zst nixpkgs-397f5c37df025e561b0cc94e71077fa0a06679f6.zip |
cryptsetup: apply Matías Lang's patch
Diffstat (limited to 'pkgs/os-specific/linux/cryptsetup/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/cryptsetup/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index e2917c81e15..4a64154b585 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, devicemapper, json_c, openssl, libuuid, pkgconfig, popt -, enablePython ? false, python2 ? null -}: +, enablePython ? false, python2 ? null }: assert enablePython -> python2 != null; @@ -12,12 +11,17 @@ stdenv.mkDerivation rec { sha256 = "15wyjfgcqjf0wy5gxnmjj8aah33csv5v6n1hv9c8sxdzygbhb0ag"; }; - configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ] - ++ stdenv.lib.optional enablePython "--enable-python"; + NIX_LDFLAGS = "-lgcc_s"; + + configureFlags = [ + "--disable-kernel_crypto" + "--enable-cryptsetup-reencrypt" + "--with-crypto_backend=openssl" + ] ++ stdenv.lib.optional enablePython "--enable-python"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ devicemapper json_c openssl libuuid popt ] - ++ stdenv.lib.optional enablePython python2; + ++ stdenv.lib.optional enablePython python2; meta = { homepage = https://gitlab.com/cryptsetup/cryptsetup/; |