From a72822c23fb1c55eef84fdb181f8e4292f06aa3c Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Sun, 19 Jul 2020 17:13:23 -0700 Subject: [PATCH] libpwquality: fixup static build Close #96023 (original PR). Amended by vcunat (isMusl != isStatic). --- .../libraries/libpwquality/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix index bd45cb529f1a..5d83b137b8e6 100644 --- a/pkgs/development/libraries/libpwquality/default.nix +++ b/pkgs/development/libraries/libpwquality/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python3 }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python3, fetchpatch }: stdenv.mkDerivation rec { pname = "libpwquality"; @@ -11,8 +11,21 @@ stdenv.mkDerivation rec { sha256 = "0n4pjhm7wfivk0wizggaxq4y4mcxic876wcarjabkp5z9k14y36h"; }; - nativeBuildInputs = [ autoreconfHook perl ]; - buildInputs = [ cracklib python3 ]; + nativeBuildInputs = [ autoreconfHook perl python3 ]; + buildInputs = [ cracklib ]; + + patches = lib.optional stdenv.hostPlatform.isStatic [ + (fetchpatch { + name = "static-build.patch"; + url = "https://github.com/libpwquality/libpwquality/pull/40.patch"; + sha256 = "1ypccq437wxwgddd98cvd330jfm7jscdlzlyxgy05g6yzrr68xyk"; + }) + ]; + + configureFlags = lib.optional stdenv.hostPlatform.isStatic [ + # Python binding generates a shared library which are unavailable with musl build + "--disable-python-bindings" + ]; meta = with lib; { description = "Password quality checking and random password generation library";