mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-01 19:33:03 +00:00
Merge pull request #67204 from jtojnar/libical-3.0.5
libical: 3.0.4 → 3.0.5
This commit is contained in:
commit
67bd99052a
@ -1,34 +1,64 @@
|
||||
{ stdenv, fetchFromGitHub, perl, pkgconfig, cmake, ninja, vala, gobject-introspection
|
||||
, python3, tzdata, glib, libxml2, icu }:
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, icu
|
||||
, libxml2
|
||||
, ninja
|
||||
, perl
|
||||
, pkgconfig
|
||||
, python3
|
||||
, tzdata
|
||||
, vala
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libical";
|
||||
version = "3.0.4";
|
||||
version = "3.0.5";
|
||||
|
||||
outputs = [ "out" "dev" ]; #"devdoc" ];
|
||||
outputs = [ "out" "dev" ]; # "devdoc" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libical";
|
||||
repo = "libical";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qgpbdjd6jsivw87v5w52268kqp0rv780kli8cgb3ndlv592wlbm";
|
||||
sha256 = "03kjc4s1svmzkmzkr0irgczq37aslhj4bxnvjqav0jwa2zrynhra";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
perl pkgconfig cmake ninja vala gobject-introspection
|
||||
(python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests
|
||||
# Docs building fails: https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489
|
||||
# gtk-doc docbook_xsl docbook_xml_dtd_43 # docs
|
||||
cmake
|
||||
gobject-introspection
|
||||
ninja
|
||||
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 = [
|
||||
"-DGOBJECT_INTROSPECTION=True"
|
||||
"-DENABLE_GTK_DOC=False"
|
||||
"-DICAL_GLIB_VAPI=True"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# TODO: upstream this patch
|
||||
# Will appear in 3.1.0
|
||||
# https://github.com/libical/libical/issues/350
|
||||
./respect-env-tzdir.patch
|
||||
];
|
||||
|
Loading…
Reference in New Issue
Block a user