public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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 }: , intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
done 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 ]; propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ];
postInstall = '' postInstall = ''

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

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

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

@ -1470,7 +1470,7 @@ in
ecryptfs = callPackage ../tools/security/ecryptfs { }; 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 { }; editres = callPackage ../tools/graphics/editres { };