mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 23:20:55 +00:00
Merge pull request #84515 from doronbehar/improve-ecryptfs
ecryptfs: enable building without python2 support
This commit is contained in:
commit
fcea61d1fb
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python2, pam
|
||||
{ stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python2, pam, enablePython ? false
|
||||
, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -33,8 +33,15 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ perl nss nspr python2 pam intltool makeWrapper ];
|
||||
configureFlags = stdenv.lib.optionals (!enablePython) [ "--disable-pywrap" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ]
|
||||
# if python2 support is requested, it is needed at builtime as well as runtime.
|
||||
++ stdenv.lib.optionals (enablePython) [ python2 ]
|
||||
;
|
||||
buildInputs = [ perl nss nspr pam intltool makeWrapper ]
|
||||
++ stdenv.lib.optionals (enablePython) [ python2 ]
|
||||
;
|
||||
propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ];
|
||||
|
||||
postInstall = ''
|
||||
|
|
Loading…
Reference in a new issue