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

Merge pull request #54479 from gefla/master

Browse Source 
picocom: Enable on Darwin
This commit is contained in:
Dmitry Kalinkin 2019-01-22 15:45:56 -05:00 committed by GitHub
commit 7be4f4523b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/misc/picocom/default.nix
View File

@ -1,4 +1,8 @@
{ stdenv, fetchFromGitHub, makeWrapper, lrzsz }:
{ stdenv, fetchFromGitHub, makeWrapper, lrzsz, IOKit }:
assert stdenv.isDarwin -> IOKit != null;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "picocom-${version}";
@ -11,7 +15,8 @@ stdenv.mkDerivation rec {
sha256 = "1vvjydqf0ax47nvdyyl67jafw5b3sfsav00xid6qpgia1gs2r72n";
};
buildInputs = [ makeWrapper ];
buildInputs = [ makeWrapper ]
++ optionals stdenv.isDarwin [ IOKit ];
installPhase = ''
mkdir -p $out/bin $out/share/man/man1
@ -26,6 +31,6 @@ stdenv.mkDerivation rec {
description = "Minimal dumb-terminal emulation program";
homepage = https://github.com/npat-efault/picocom/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
platforms = platforms.unix;
};
}

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

@ -18821,7 +18821,9 @@ in
picard = callPackage ../applications/audio/picard { };
picocom = callPackage ../tools/misc/picocom { };
picocom = callPackage ../tools/misc/picocom {
inherit (darwin.apple_sdk.frameworks) IOKit;
};
pidgin = callPackage ../applications/networking/instant-messengers/pidgin {
openssl = if config.pidgin.openssl or true then openssl else null;