From 312a38afbeba76ad80d37683c02eaa625abcc467 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jun 2023 18:42:07 +0800 Subject: cinnamon.xapp: 2.4.3 -> 2.6.1 https://github.com/linuxmint/xapp/compare/2.4.3...2.6.1 --- pkgs/desktops/cinnamon/xapp/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/cinnamon/xapp/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix index e099124784293..7139dce15c79e 100644 --- a/pkgs/desktops/cinnamon/xapp/default.nix +++ b/pkgs/desktops/cinnamon/xapp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "xapp"; - version = "2.4.3"; + version = "2.6.1"; outputs = [ "out" "dev" ]; @@ -30,9 +30,13 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-j04vy/uVWY08Xdxqfo2MMUAlqsUMJTsAt67+XjkdhFg="; + hash = "sha256-ZxIPiDLcMHEmlnrImctI2ZfH3AIOjB4m/RPGipJ7koM="; }; + # Recommended by upstream, which enables the build of xapp-debug. + # https://github.com/linuxmint/xapp/issues/169#issuecomment-1574962071 + mesonBuildType = "debugoptimized"; + nativeBuildInputs = [ meson ninja @@ -70,11 +74,7 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x schemas/meson_install_schemas.py # patchShebangs requires executable file - - patchShebangs \ - libxapp/g-codegen.py \ - meson-scripts/g-codegen.py \ - schemas/meson_install_schemas.py + patchShebangs schemas/meson_install_schemas.py # Patch pastebin & inxi location sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info -- cgit 1.4.1