JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33913 from ciderale/fix-darwin-build-of-kpcli

Browse Source 
kpcli: Fix darwin build
This commit is contained in:
Daiderd Jordan 2018-01-16 21:17:58 +01:00 committed by GitHub
commit 75936c412d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/security/kpcli/default.nix
View File

@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
chmod +x $out/bin/kpcli
wrapProgram $out/bin/kpcli --set PERL5LIB \
"${with perlPackages; stdenv.lib.makePerlPath [
"${with perlPackages; stdenv.lib.makePerlPath ([
CaptureTiny Clipboard Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser
]}"
] ++ stdenv.lib.optional stdenv.isDarwin MacPasteboard)}"
'';

20
pkgs/top-level/perl-packages.nix
View File

@ -2184,6 +2184,12 @@ let self = _self // overrides; _self = with self; {
description = "Clipboard - Copy and Paste with any OS";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin MacPasteboard;
# Disable test on darwin because MacPasteboard fails when not logged in interactively.
# Mac OS error -4960 (coreFoundationUnknownErr): The unknown error at lib/Clipboard/MacPasteboard.pm line 3.
# Mac-Pasteboard-0.009.readme: 'NOTE that Mac OS X appears to restrict pasteboard access to processes that are logged in interactively.
# Ssh sessions and cron jobs can not create the requisite pasteboard handles, giving coreFoundationUnknownErr (-4960)'
doCheck = !stdenv.isDarwin;
};
@ -8320,6 +8326,20 @@ let self = _self // overrides; _self = with self; {
inherit fetchurl buildPerlPackage stdenv DBDmysql;
};
MacPasteboard = buildPerlPackage rec {
name = "Mac-Pasteboard-0.009";
src = fetchurl {
url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz";
sha256 = "85b1d5e9630973b997c3c1634e2df964d6a8d6cb57d9abe1f7093385cf26cf54";
};
meta = with stdenv.lib; {
description = "Manipulate Mac OS X pasteboards";
license = with licenses; [ artistic1 gpl1Plus ];
platforms = platforms.darwin;
};
buildInputs = [ pkgs.darwin.apple_sdk.frameworks.ApplicationServices ];
};
MailMaildir = buildPerlPackage rec {
version = "1.0.0";
name = "Mail-Maildir-${version}";