xapp: 2.8.5 -> 2.8.6

https://github.com/linuxmint/xapp/compare/2.8.5...2.8.6
This commit is contained in:
Bobby Rong 2024-11-25 23:04:55 +08:00
parent d5ba75979a
commit 94fe01900a
No known key found for this signature in database

View File

@ -14,6 +14,7 @@
, stdenv , stdenv
, vala , vala
, wrapGAppsHook3 , wrapGAppsHook3
, file
, inxi , inxi
, mate , mate
, dbus , dbus
@ -22,7 +23,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xapp"; pname = "xapp";
version = "2.8.5"; version = "2.8.6";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-HGWaa1S+maphP9colWdWSzGyoA0f4vJkF889X5/rzvs="; hash = "sha256-OQfP0XPBQrxJDrKb5PEqpBtinkQ35NMUbsYnxhbuehU=";
}; };
# Recommended by upstream, which enables the build of xapp-debug. # Recommended by upstream, which enables the build of xapp-debug.
@ -76,13 +77,18 @@ stdenv.mkDerivation rec {
chmod +x schemas/meson_install_schemas.py # patchShebangs requires executable file chmod +x schemas/meson_install_schemas.py # patchShebangs requires executable file
patchShebangs schemas/meson_install_schemas.py patchShebangs schemas/meson_install_schemas.py
# Patch pastebin & inxi location # Used in cinnamon-settings
sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info substituteInPlace scripts/upload-system-info \
sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info --replace-fail "'/usr/bin/pastebin'" "'$out/bin/pastebin'" \
--replace-fail "'inxi'" "'${inxi}/bin/inxi'"
# Used in x-d-p-xapp
substituteInPlace scripts/xfce4-set-wallpaper \
--replace-fail "file --mime-type" "${file}/bin/file --mime-type"
''; '';
# Fix gtk3 module target dir. Proper upstream solution should be using define_variable. # Fix gtk3 module target dir. Proper upstream solution should be using define_variable.
PKG_CONFIG_GTK__3_0_LIBDIR = "${placeholder "out"}/lib"; env.PKG_CONFIG_GTK__3_0_LIBDIR = "${placeholder "out"}/lib";
meta = with lib; { meta = with lib; {
homepage = "https://github.com/linuxmint/xapp"; homepage = "https://github.com/linuxmint/xapp";