Merge pull request #51349 from marsam/feature/fix-vdirsyncer
vdirsyncer: fix build
This commit is contained in:
commit
3f4cbd47af
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, python3Packages, glibcLocales, rustPlatform, pkgconfig, openssl }:
|
{ stdenv, python3Packages, fetchpatch, glibcLocales, rustPlatform, pkgconfig, openssl, 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
|
||||||
|
@ -16,7 +16,7 @@ let
|
||||||
inherit src;
|
inherit src;
|
||||||
sourceRoot = name + "/rust";
|
sourceRoot = name + "/rust";
|
||||||
cargoSha256 = "08xq9q5fx37azzkqqgwcnds1yd8687gh26dsl3ivql5h13fa2w3q";
|
cargoSha256 = "08xq9q5fx37azzkqqgwcnds1yd8687gh26dsl3ivql5h13fa2w3q";
|
||||||
buildInputs = [ pkgconfig openssl ];
|
buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
|
||||||
};
|
};
|
||||||
in pythonPackages.buildPythonApplication rec {
|
in pythonPackages.buildPythonApplication rec {
|
||||||
inherit version pname src native;
|
inherit version pname src native;
|
||||||
|
@ -35,6 +35,21 @@ in pythonPackages.buildPythonApplication rec {
|
||||||
|
|
||||||
checkInputs = with pythonPackages; [ hypothesis pytest pytest-localserver pytest-subtesthack ] ++ [ glibcLocales ];
|
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 = ''
|
postPatch = ''
|
||||||
sed -i 's/spec.add_external_build(cmd=cmd/spec.add_external_build(cmd="true"/g' setup.py
|
sed -i 's/spec.add_external_build(cmd=cmd/spec.add_external_build(cmd="true"/g' setup.py
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -19502,7 +19502,9 @@ with pkgs;
|
||||||
|
|
||||||
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;
|
||||||
|
};
|
||||||
|
|
||||||
vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
|
vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue