Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[staging 24.11]: libical: 3.0.18 -> 3.0.20 #389004

Open
wants to merge 2 commits into
base: staging-24.11
Choose a base branch
from
Open

[staging 24.11]: libical: 3.0.18 -> 3.0.20 #389004

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
276dc1d
libical: 3.0.18 -> 3.0.19
K900 Feb 10, 2025
84378a5
libical: 3.0.19 -> 3.0.20
matthiasbeyer Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions pkgs/by-name/li/libical/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

stdenv.mkDerivation rec {
pname = "libical";
version = "3.0.18";
version = "3.0.20";

outputs = [
"out"
Expand All @@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
owner = "libical";
repo = "libical";
rev = "v${version}";
sha256 = "sha256-32FNnCybXO67Vtg1LM6miJUaK+r0mlfjxgLQg1LD8Es=";
sha256 = "sha256-KIMqZ6QAh+fTcKEYrcLlxgip91CLAwL9rwjUdKzBsQk=";
};

strictDeps = true;
Expand Down Expand Up @@ -93,16 +93,7 @@ stdenv.mkDerivation rec {
./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}"
'';

# 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;
Expand Down