summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2018-12-01 17:34:28 -0500
committerMario Rodas <marsam@users.noreply.github.com>2018-12-01 19:17:54 -0500
commitc154ecfc3841fb6693b6e1585da2afb16bf8e8cd (patch)
treecef3a2e6cb960c323998fb5c5aae7f5ab8b93147 /pkgs
parent8a5c9882cbf0e126e83f63a6f16ab8f3d640269b (diff)
downloadnixpkgs-c154ecfc3841fb6693b6e1585da2afb16bf8e8cd.tar
nixpkgs-c154ecfc3841fb6693b6e1585da2afb16bf8e8cd.tar.gz
nixpkgs-c154ecfc3841fb6693b6e1585da2afb16bf8e8cd.tar.bz2
nixpkgs-c154ecfc3841fb6693b6e1585da2afb16bf8e8cd.tar.lz
nixpkgs-c154ecfc3841fb6693b6e1585da2afb16bf8e8cd.tar.xz
nixpkgs-c154ecfc3841fb6693b6e1585da2afb16bf8e8cd.tar.zst
nixpkgs-c154ecfc3841fb6693b6e1585da2afb16bf8e8cd.zip
vdirsyncer: fix build
- Add support for build on darwin
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/misc/vdirsyncer/default.nix19
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 20 insertions, 3 deletions
diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index c273ef87968..49583ee2890 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3Packages, glibcLocales, rustPlatform, pkgconfig, openssl }:
+{ stdenv, python3Packages, fetchpatch, glibcLocales, rustPlatform, pkgconfig, openssl, Security }:
 
 # Packaging documentation at:
 # https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst
@@ -16,7 +16,7 @@ let
     inherit src;
     sourceRoot = name + "/rust";
     cargoSha256 = "08xq9q5fx37azzkqqgwcnds1yd8687gh26dsl3ivql5h13fa2w3q";
-    buildInputs = [ pkgconfig openssl ];
+    buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
   };
 in pythonPackages.buildPythonApplication rec {
   inherit version pname src native;
@@ -35,6 +35,21 @@ in pythonPackages.buildPythonApplication rec {
 
   checkInputs = with pythonPackages; [ hypothesis pytest pytest-localserver pytest-subtesthack ] ++ [ glibcLocales ];
 
+  patches = [
+    (fetchpatch {
+      url = https://github.com/pimutils/vdirsyncer/commit/80a42e4c6c18ca4db737bc6700c50a3866832bbb.patch;
+      sha256 = "1vrhn0ma3y08w6f5abhl3r5rq30g60h1bp3wmyszw909hyvyzp5l";
+    })
+    (fetchpatch {
+      url = https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch;
+      sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl";
+    })
+    (fetchpatch {
+      url = https://github.com/pimutils/vdirsyncer/commit/29417235321c249c65904bc7948b066ef5683aee.patch;
+      sha256 = "0zvr0y88gm3vprjcdzs4m151laa9qhkyi61rvrfdjmf42fwhbm80";
+    })
+  ];
+
   postPatch = ''
     sed -i 's/spec.add_external_build(cmd=cmd/spec.add_external_build(cmd="true"/g' setup.py
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc18e0a0611..baf74815715 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19502,7 +19502,9 @@ with pkgs;
 
   vcv-rack = callPackage ../applications/audio/vcv-rack { };
 
-  vdirsyncer = callPackage ../tools/misc/vdirsyncer { };
+  vdirsyncer = callPackage ../tools/misc/vdirsyncer {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   vdpauinfo = callPackage ../tools/X11/vdpauinfo { };