MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #75678 from marsam/fix-vdirsyncer-darwin

Browse source 
vdirsyncer: fix build on darwin
This commit is contained in:
Gabriel Ebner 2019-12-15 10:37:53 +01:00 committed by GitHub
commit 86ed15dcce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/misc/vdirsyncer/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, python3Packages, fetchFromGitHub, fetchpatch, rustPlatform, pkgconfig, openssl, Security }: { stdenv, python3Packages, fetchFromGitHub, fetchpatch, rustPlatform, pkgconfig, openssl, CoreServices, Security }:
# Packaging documentation at: # Packaging documentation at:
# https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst # https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst
@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
inherit src; inherit src;
sourceRoot = "source/rust"; sourceRoot = "source/rust";
cargoSha256 = "1n1dxq3klsry5mmbfff2jv7ih8mr5zvpncrdgba6qs93wi77qi0y"; cargoSha256 = "1n1dxq3klsry5mmbfff2jv7ih8mr5zvpncrdgba6qs93wi77qi0y";
buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [

2
pkgs/top-level/all-packages.nix
View file

@ -21616,7 +21616,7 @@ in
vcv-rack = callPackage ../applications/audio/vcv-rack { }; vcv-rack = callPackage ../applications/audio/vcv-rack { };
vdirsyncer = callPackage ../tools/misc/vdirsyncer { vdirsyncer = callPackage ../tools/misc/vdirsyncer {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) CoreServices Security;
}; };
vdirsyncerStable = callPackage ../tools/misc/vdirsyncer/stable.nix { }; vdirsyncerStable = callPackage ../tools/misc/vdirsyncer/stable.nix { };