diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-08-13 11:55:02 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-08-13 11:55:02 -0700 |
| commit | 952def0e3c9fdb8edbfcaa187609911f350c8e02 (patch) | |
| tree | 60226de48423053363db722f85ac42ff8e5f8992 /pkgs/tools/misc | |
| parent | 257db17ee950d2865529603d1388cf7fbb8a0a89 (diff) | |
| parent | bc9bd5c02c38d6c5ae5b2e62fd0fe21c767413c7 (diff) | |
| download | nixlib-952def0e3c9fdb8edbfcaa187609911f350c8e02.tar nixlib-952def0e3c9fdb8edbfcaa187609911f350c8e02.tar.gz nixlib-952def0e3c9fdb8edbfcaa187609911f350c8e02.tar.bz2 nixlib-952def0e3c9fdb8edbfcaa187609911f350c8e02.tar.lz nixlib-952def0e3c9fdb8edbfcaa187609911f350c8e02.tar.xz nixlib-952def0e3c9fdb8edbfcaa187609911f350c8e02.tar.zst nixlib-952def0e3c9fdb8edbfcaa187609911f350c8e02.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/keychain/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 0892061a50d0..6ffd36312a3e 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg -, perl, procps, gnugrep, gawk, findutils, gnused }: +, perl, procps, gnugrep, gawk, findutils, gnused +, withProcps ? stdenv.isLinux }: stdenv.mkDerivation rec { name = "keychain-${version}"; @@ -26,12 +27,16 @@ stdenv.mkDerivation rec { --prefix PATH ":" "${gnused}/bin" \ --prefix PATH ":" "${findutils}/bin" \ --prefix PATH ":" "${gawk}/bin" \ - --prefix PATH ":" "${procps}/bin" + ${if withProcps then ("--prefix PATH \":\" ${procps}/bin") else ""} ''; meta = { description = "Keychain management tool"; homepage = "http://www.funtoo.org/Keychain"; license = stdenv.lib.licenses.gpl2; + # other platforms are untested (AFAIK) + platforms = + with stdenv.lib; + platforms.linux ++ platforms.darwin; }; } |