JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #84515 from doronbehar/improve-ecryptfs

Browse Source 
ecryptfs: enable building without python2 support
This commit is contained in:
Jörg Thalheim 2020-05-26 08:47:16 +01:00 committed by GitHub
commit fcea61d1fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/security/ecryptfs/default.nix
View File

@ -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 = ''