diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-08-19 13:54:48 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-08-19 13:54:48 -0700 |
| commit | 901482ad999e2e4bc607012eee97057bd4c1c5df (patch) | |
| tree | 1b16b75e24fe3d65b7b730346100e7b9010ebd70 /pkgs/tools/security | |
| parent | e91523aab59ae098343b3f68dfb0c45265868d80 (diff) | |
| parent | ef07bd04dca43a3ea5902a62d729cc2cc91999d1 (diff) | |
| download | nixlib-901482ad999e2e4bc607012eee97057bd4c1c5df.tar nixlib-901482ad999e2e4bc607012eee97057bd4c1c5df.tar.gz nixlib-901482ad999e2e4bc607012eee97057bd4c1c5df.tar.bz2 nixlib-901482ad999e2e4bc607012eee97057bd4c1c5df.tar.lz nixlib-901482ad999e2e4bc607012eee97057bd4c1c5df.tar.xz nixlib-901482ad999e2e4bc607012eee97057bd4c1c5df.tar.zst nixlib-901482ad999e2e4bc607012eee97057bd4c1c5df.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/ecryptfs/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/security/pass/default.nix | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index 590e6071b529..0ea5bc62fd4e 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python, pam -, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which }: +, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }: stdenv.mkDerivation rec { name = "ecryptfs-${version}"; - version = "106"; + version = "108"; src = fetchurl { url = "http://launchpad.net/ecryptfs/trunk/${version}/+download/ecryptfs-utils_${version}.orig.tar.gz"; - sha256 = "1d5nlzcbl8ch639zi3lq6d14gkk4964j6dqhfs87i67867fhlghp"; + sha256 = "1pfpzc907m4qi5h2rxmkqq072c6g22pik2rilj4bl4qishd8p0sj"; }; #TODO: replace wrapperDir below with from <nixos> config.security.wrapperDir; @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { --prefix PATH ":" "${rsync}/bin" \ --prefix PATH ":" "${keyutils}/bin" \ --prefix PATH ":" "${which}/bin" \ + --prefix PATH ":" "${lsof}/bin" \ --prefix PATH ":" "$out/bin" done ''; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 0480962fb966..3315683967cc 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -3,7 +3,7 @@ , makeWrapper , xclip ? null, xdotool ? null, dmenu ? null -, x11Support ? true +, x11Support ? !stdenv.isDarwin }: assert x11Support -> xclip != null |