diff options
Diffstat (limited to 'pkgs/development/libraries/libical/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libical/default.nix | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 48e611a3482..435d1cc9bc0 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -13,7 +13,6 @@ , python3 , tzdata , fixDarwinDylibNames -, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform , gobject-introspection , vala }: @@ -37,6 +36,8 @@ stdenv.mkDerivation rec { ninja perl pkg-config + gobject-introspection + vala # Docs building fails: # https://github.com/NixOS/nixpkgs/pull/67204 # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 @@ -44,15 +45,12 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # provides ical-glib-src-generator that runs during build libical - ] ++ lib.optionals withIntrospection [ - gobject-introspection - vala ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; installCheckInputs = [ # running libical-glib tests - (python3.withPackages (pkgs: with pkgs; [ + (python3.pythonForBuild.withPackages (pkgs: with pkgs; [ pygobject3 ])) ]; @@ -61,14 +59,10 @@ stdenv.mkDerivation rec { glib libxml2 icu - ] ++ lib.optionals withIntrospection [ - gobject-introspection ]; cmakeFlags = [ "-DENABLE_GTK_DOC=False" - "-DGOBJECT_INTROSPECTION=${if withIntrospection then "True" else "False"}" - "-DICAL_GLIB_VAPI=${if withIntrospection then "True" else "False"}" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DIMPORT_ICAL_GLIB_SRC_GENERATOR=${lib.getDev buildPackages.libical}/lib/cmake/LibIcal/IcalGlibSrcGenerator.cmake" ]; |