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

libical: 3.0.19 -> 3.0.20 (#392708)

Browse Source
This commit is contained in:
K900
2025-03-25 12:01:15 +03:00
committed by GitHub
parent 738aaace1e 8c3a3572c3
commit ec69aa348c
2 changed files with 5 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/li/libical/fix-cmake.patch
-30
View File
@@ -1,30 +0,0 @@
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
+5 -10
View File
@@ -20,9 +20,9 @@
vala,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "libical";
version = "3.0.19";
version = "3.0.20";
outputs = [
"out"
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "libical";
repo = "libical";
rev = "v${version}";
sha256 = "sha256-ZJXxi1LOZyEpgdcmoK0pe5IA3+l9WY0zLu6Ttzy1QSc=";
rev = "v${finalAttrs.version}";
sha256 = "sha256-KIMqZ6QAh+fTcKEYrcLlxgip91CLAwL9rwjUdKzBsQk=";
};
strictDeps = true;
@@ -91,11 +91,6 @@ stdenv.mkDerivation rec {
# Will appear in 3.1.0
# https://github.com/libical/libical/issues/350
./respect-env-tzdir.patch
# 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 GI_TYPELIB_PATH
@@ -129,4 +124,4 @@ stdenv.mkDerivation rec {
license = licenses.mpl20;
platforms = platforms.unix;
};
}
})