From 397f5c37df025e561b0cc94e71077fa0a06679f6 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 15 Jun 2018 23:20:53 +0000 Subject: [PATCH] =?UTF-8?q?cryptsetup:=20apply=20Mat=C3=ADas=20Lang's=20pa?= =?UTF-8?q?tch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/os-specific/linux/cryptsetup/default.nix | 14 +++++++++----- 1 file 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/;