BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ecryptfs: use python2

Browse source 
print statement
This commit is contained in:
Frederik Rietdijk 2016-10-18 09:12:36 +02:00
parent aa652d0df7
commit b33d3cca02
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/security/ecryptfs/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python, pam
{ stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python2, pam
, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }:
stdenv.mkDerivation rec {
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
done
'';
buildInputs = [ pkgconfig perl nss nspr python pam intltool makeWrapper ];
buildInputs = [ pkgconfig perl nss nspr python2 pam intltool makeWrapper ];
propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ];
postInstall = ''

4
pkgs/tools/security/ecryptfs/helper.nix
View file

@ -1,7 +1,7 @@
{ stdenv
, fetchurl
, makeWrapper
, python
, python2
}:
stdenv.mkDerivation rec {
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin $out/libexec
cp $src $out/libexec/ecryptfs-helper.py
makeWrapper "${python.interpreter} $out/libexec/ecryptfs-helper.py" $out/bin/ecryptfs-helper
makeWrapper "${python2.interpreter} $out/libexec/ecryptfs-helper.py" $out/bin/ecryptfs-helper
'';
meta = with stdenv.lib; {

2
pkgs/top-level/all-packages.nix
View file

@ -1470,7 +1470,7 @@ in
ecryptfs = callPackage ../tools/security/ecryptfs { };
ecryptfs-helper = callPackage ../tools/security/ecryptfs/helper.nix { python = python2; };
ecryptfs-helper = callPackage ../tools/security/ecryptfs/helper.nix { };
editres = callPackage ../tools/graphics/editres { };