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

Merge pull request #67204 from jtojnar/libical-3.0.5

Browse Source 
libical: 3.0.4 → 3.0.5
This commit is contained in:
Jan Tojnar 2019-08-23 01:27:16 +02:00 committed by GitHub
commit 67bd99052a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
pkgs/development/libraries/libical/default.nix
View File

@ -1,34 +1,64 @@
{ stdenv, fetchFromGitHub, perl, pkgconfig, cmake, ninja, vala, gobject-introspection { stdenv
, python3, tzdata, glib, libxml2, icu }: , fetchFromGitHub
, cmake
, glib
, gobject-introspection
, icu
, libxml2
, ninja
, perl
, pkgconfig
, python3
, tzdata
, vala
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libical"; pname = "libical";
version = "3.0.4"; version = "3.0.5";
outputs = [ "out" "dev" ]; #"devdoc" ]; outputs = [ "out" "dev" ]; # "devdoc" ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libical"; owner = "libical";
repo = "libical"; repo = "libical";
rev = "v${version}"; rev = "v${version}";
sha256 = "1qgpbdjd6jsivw87v5w52268kqp0rv780kli8cgb3ndlv592wlbm"; sha256 = "03kjc4s1svmzkmzkr0irgczq37aslhj4bxnvjqav0jwa2zrynhra";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
perl pkgconfig cmake ninja vala gobject-introspection cmake
(python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests gobject-introspection
# Docs building fails: https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 ninja
# gtk-doc docbook_xsl docbook_xml_dtd_43 # docs perl
pkgconfig
vala
# Docs building fails:
# https://github.com/NixOS/nixpkgs/pull/67204
# previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489
# gtk-doc docbook_xsl docbook_xml_dtd_43 # for docs
];
installCheckInputs = [
# running libical-glib tests
(python3.withPackages (pkgs: with pkgs; [
pygobject3
]))
];
buildInputs = [
glib
libxml2
icu
]; ];
buildInputs = [ glib libxml2 icu ];
cmakeFlags = [ cmakeFlags = [
"-DGOBJECT_INTROSPECTION=True" "-DGOBJECT_INTROSPECTION=True"
"-DENABLE_GTK_DOC=False"
"-DICAL_GLIB_VAPI=True" "-DICAL_GLIB_VAPI=True"
]; ];
patches = [ patches = [
# TODO: upstream this patch # Will appear in 3.1.0
# https://github.com/libical/libical/issues/350 # https://github.com/libical/libical/issues/350
./respect-env-tzdir.patch ./respect-env-tzdir.patch
]; ];