nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 01:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ayatana-indicator-datetime: 23.10.1 -> 24.2.0

Browse Source
This commit is contained in:
OPNA2608 2024-04-17 16:05:28 +02:00
parent 6d6ab74199
commit 167194b437
1 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/by-name/ay/ayatana-indicator-datetime/package.nix
View File

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, gitUpdater
, nixosTests
, ayatana-indicator-messages
@ -32,38 +31,20 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "ayatana-indicator-datetime";
version = "23.10.1";
version = "24.2.0";
src = fetchFromGitHub {
owner = "AyatanaIndicators";
repo = "ayatana-indicator-datetime";
rev = finalAttrs.version;
hash = "sha256-cm1zhG9TODGe79n/fGuyVnWL/sjxUc3ZCu9FhqA1NLE=";
hash = "sha256-J3Yp7Dx4UvvdlM8Cp1sPe4Ftm/aAmNzpo4re/jF7pRo=";
};
patches = [
# Fix test-menus building & running
# Remove when version > 23.10.1
(fetchpatch {
name = "0001-ayatana-indicator-datetime-Fix-test-menus-tests.patch";
url = "https://github.com/AyatanaIndicators/ayatana-indicator-datetime/commit/ddabb4a61a496da14603573b700c5961a3e5b834.patch";
hash = "sha256-vf8aVXonCoTWMuAQZG6FuklWR2IaGY4hecFtoyNCGg8=";
})
# Fix EDS-related tests
# Remove when version > 23.10.1
(fetchpatch {
name = "0002-ayatana-indicator-datetime-Fix-EDS-colour-tests.patch";
url = "https://github.com/AyatanaIndicators/ayatana-indicator-datetime/commit/6d67f7b458911833e72e0b4a162b1d823609d6f8.patch";
hash = "sha256-VUdMJuma6rmsjUOeyO0W8UNKADODiM+wDVfj6aDhqgw=";
})
];
postPatch = ''
# Queries systemd user unit dir via pkg_get_variable, can't override prefix
# Override systemd prefix
substituteInPlace data/CMakeLists.txt \
--replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_DIR ''${CMAKE_INSTALL_PREFIX}/lib/systemd/user)' \
--replace-fail '/etc' "\''${CMAKE_INSTALL_FULL_SYSCONFDIR}"
--replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \
--replace-fail 'XDG_AUTOSTART_DIR "/etc' 'XDG_AUTOSTART_DIR "''${CMAKE_INSTALL_FULL_SYSCONFDIR}'
# Looking for Lomiri schemas for code generation
substituteInPlace src/CMakeLists.txt \
@ -136,8 +117,8 @@ stdenv.mkDerivation (finalAttrs: {
]}
'';
# schema is already added automatically by wrapper, EDS needs to be added explicitly
preFixup = ''
# schema is already added automatically by wrapper, EDS needs to be added explicitly
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${edsDataDir}"
)