From b33d3cca0260d3c0fc2d1d980da3c9949ea117c7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 18 Oct 2016 09:12:36 +0200 Subject: [PATCH] ecryptfs: use python2 print statement --- pkgs/tools/security/ecryptfs/default.nix | 4 ++-- pkgs/tools/security/ecryptfs/helper.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index 582b5ceae119..4981d8fa062a 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -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 = '' diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix index 40e6771251ab..0d4b37a8efc0 100644 --- a/pkgs/tools/security/ecryptfs/helper.nix +++ b/pkgs/tools/security/ecryptfs/helper.nix @@ -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; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a977fcf33c8b..4315327c8913 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };