libical: 3.0.18 -> 3.0.19 (#391868)

Author: vcunat

pkgs/by-name/li/libical/fix-cmake.patch

@@ -0,0 +1,30 @@
+diff --git a/src/test/libical-glib/CMakeLists.txt b/src/test/libical-glib/CMakeLists.txt
+index 01a0894a1..d7d2af5bb 100644
+--- a/src/test/libical-glib/CMakeLists.txt
++++ b/src/test/libical-glib/CMakeLists.txt
+@@ -36,19 +36,19 @@ list(
+ 
+ if(PYTHON3)
+   set(GI_TYPELIB_PATH_STR "${PROJECT_BINARY_DIR}/src/libical-glib")
+-  if(DEFINED GI_TYPELIB_PATH)
+-    if($ENV{GI_TYPELIB_PATH})
++  if(DEFINED ENV{GI_TYPELIB_PATH})
++    if(NOT ENV{GI_TYPELIB_PATH} STREQUAL "")
+       set(GI_TYPELIB_PATH_STR "${GI_TYPELIB_PATH_STR}:$ENV{GI_TYPELIB_PATH}")
+     endif()
+   endif()
+   set(LIBRARY_PATH_STR "${LIBRARY_OUTPUT_PATH}")
+-  if(DEFINED LD_LIBRARY_PATH)
+-    if($ENV{LD_LIBRARY_PATH})
++  if(DEFINED ENV{LD_LIBRARY_PATH})
++    if(NOT ENV{LD_LIBRARY_PATH} STREQUAL "")
+       set(LIBRARY_PATH_STR "${LIBRARY_PATH_STR}:$ENV{LD_LIBRARY_PATH}")
+     endif()
+   endif()
+-  if(DEFINED DYLD_LIBRARY_PATH)
+-    if($ENV{DYLD_LIBRARY_PATH})
++  if(DEFINED ENV{DYLD_LIBRARY_PATH})
++    if(NOT ENV{DYLD_LIBRARY_PATH} STREQUAL "")
+       set(LIBRARY_PATH_STR "${LIBRARY_PATH_STR}:$ENV{DYLD_LIBRARY_PATH}")
+     endif()
+   endif()

pkgs/by-name/li/libical/package.nix

@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libical";
-  version = "3.0.18";
+  version = "3.0.19";
 
   outputs = [
     "out"
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     owner = "libical";
     repo = "libical";
     rev = "v${version}";
-    sha256 = "sha256-32FNnCybXO67Vtg1LM6miJUaK+r0mlfjxgLQg1LD8Es=";
+    sha256 = "sha256-ZJXxi1LOZyEpgdcmoK0pe5IA3+l9WY0zLu6Ttzy1QSc=";
   };
 
   strictDeps = true;
@@ -91,18 +91,14 @@ stdenv.mkDerivation rec {
     # Will appear in 3.1.0
     # https://github.com/libical/libical/issues/350
     ./respect-env-tzdir.patch
-  ];
 
-  postPatch = ''
-    # Fix typo in test env setup
-    # https://github.com/libical/libical/commit/03c02ced21494413920744a400c638b0cb5d493f
-    substituteInPlace src/test/libical-glib/CMakeLists.txt \
-      --replace-fail "''${CMAKE_BINARY_DIR}/src/libical-glib;\$ENV{GI_TYPELIB_PATH}" "''${CMAKE_BINARY_DIR}/src/libical-glib:\$ENV{GI_TYPELIB_PATH}" \
-      --replace-fail "''${LIBRARY_OUTPUT_PATH};\$ENV{LD_LIBRARY_PATH}" "''${LIBRARY_OUTPUT_PATH}:\$ENV{LD_LIBRARY_PATH}"
-  '';
+    # CMake setup fix for tests
+    # Submitted upstream: https://github.com/libical/libical/pull/885
+    # FIXME: remove when merged
+    ./fix-cmake.patch
+  ];
 
-  # Using install check so we do not have to manually set
-  # LD_LIBRARY_PATH and GI_TYPELIB_PATH variables
+  # Using install check so we do not have to manually set GI_TYPELIB_PATH
   # Musl does not support TZDIR.
   doInstallCheck = !stdenv.hostPlatform.isMusl;
   enableParallelChecking = false;