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

Merge pull request #120707 from onsails/ffsend 

ffsend: fix build on darwin
This commit is contained in:
Sandro 2021-04-30 14:47:55 +02:00 committed by GitHub
parent 536ae468d2 9b2ec3bc72
commit 039d5a2d1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/misc/ffsend/default.nix
View File

@ -1,5 +1,6 @@
{ lib, stdenv, fetchFromGitLab, rustPlatform, cmake, pkg-config, openssl { lib, stdenv, fetchFromGitLab, rustPlatform, cmake, pkg-config, openssl
, darwin, installShellFiles , installShellFiles
, CoreFoundation, CoreServices, Security, AppKit, libiconv
, x11Support ? stdenv.isLinux || stdenv.hostPlatform.isBSD , x11Support ? stdenv.isLinux || stdenv.hostPlatform.isBSD
, xclip ? null, xsel ? null , xclip ? null, xsel ? null
@ -29,7 +30,7 @@ buildRustPackage rec {
nativeBuildInputs = [ cmake pkg-config installShellFiles ]; nativeBuildInputs = [ cmake pkg-config installShellFiles ];
buildInputs = buildInputs =
if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ]) if stdenv.isDarwin then [ libiconv CoreFoundation CoreServices Security AppKit ]
else [ openssl ]; else [ openssl ];
preBuild = lib.optionalString (x11Support && usesX11) ( preBuild = lib.optionalString (x11Support && usesX11) (

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

@ -4459,7 +4459,9 @@ in
ferm = callPackage ../tools/networking/ferm { }; ferm = callPackage ../tools/networking/ferm { };
ffsend = callPackage ../tools/misc/ffsend { }; ffsend = callPackage ../tools/misc/ffsend {
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security AppKit;
};
fgallery = callPackage ../tools/graphics/fgallery { }; fgallery = callPackage ../tools/graphics/fgallery { };