diff --git a/pkgs/by-name/li/lightdm-slick-greeter/package.nix b/pkgs/by-name/li/lightdm-slick-greeter/package.nix index ca9bc2a58e27..c43509b41000 100644 --- a/pkgs/by-name/li/lightdm-slick-greeter/package.nix +++ b/pkgs/by-name/li/lightdm-slick-greeter/package.nix @@ -18,17 +18,18 @@ linkFarm, lightdm-slick-greeter, numlockx, + xapp-symbolic-icons, }: stdenv.mkDerivation rec { pname = "lightdm-slick-greeter"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "slick-greeter"; rev = version; - hash = "sha256-32H2Q/JdT5v0xrdsZfSJobJ4Dxx63LPgbiB9OKIyc1U="; + hash = "sha256-htyFH1Q8RFyvkW75NMpjajNJDzv/87k/Dr8+R5beT2w="; }; nativeBuildInputs = [ @@ -85,6 +86,7 @@ stdenv.mkDerivation rec { buildPythonPath "$out $pythonPath" gappsWrapperArgs+=( --prefix PYTHONPATH : "$program_PYTHONPATH" + --prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share" [ xapp-symbolic-icons ]}" ) ''; diff --git a/pkgs/by-name/pi/pix/package.nix b/pkgs/by-name/pi/pix/package.nix index 7a750605a441..69f2975f3144 100644 --- a/pkgs/by-name/pi/pix/package.nix +++ b/pkgs/by-name/pi/pix/package.nix @@ -30,17 +30,18 @@ desktop-file-utils, itstool, xapp, + xapp-symbolic-icons, }: stdenv.mkDerivation rec { pname = "pix"; - version = "3.4.7"; + version = "3.4.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = "pix"; rev = version; - hash = "sha256-Z8JGss5DA4Lsj7fhjRztF6Y+zYjZuIbmYRo7wvwxB8k="; + hash = "sha256-zK02qhTGuYgZWHkJ6c3EVinUcojNEWwecvPjblECLkw="; }; nativeBuildInputs = [ @@ -85,7 +86,6 @@ stdenv.mkDerivation rec { patchShebangs data/gschemas/make-enums.py \ pix/make-pix-h.py \ - po/make-potfiles-in.py \ postinstall.py \ pix/make-authors-tab.py ''; @@ -95,7 +95,12 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dwebservices=false" ]; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${ + lib.makeSearchPath "share" [ + shared-mime-info + xapp-symbolic-icons + ] + }") ''; meta = with lib; { diff --git a/pkgs/by-name/st/sticky/package.nix b/pkgs/by-name/st/sticky/package.nix index 1e5910ba4e5d..666d6e24563a 100644 --- a/pkgs/by-name/st/sticky/package.nix +++ b/pkgs/by-name/st/sticky/package.nix @@ -11,18 +11,19 @@ glib, gspell, gtk3, + xapp-symbolic-icons, gitUpdater, }: stdenv.mkDerivation rec { pname = "sticky"; - version = "1.27"; + version = "1.28"; src = fetchFromGitHub { owner = "linuxmint"; repo = "sticky"; rev = version; - hash = "sha256-IuYRcvoUyY03aEclkiOmamjb/c/JaYYIoqKdcwDSY8Q="; + hash = "sha256-6CRkeJ2xuUs3viyYxnrgGFUIakK7ANyVpPZuwU486NM="; }; postPatch = '' @@ -51,14 +52,13 @@ stdenv.mkDerivation rec { python-xapp ]; - dontWrapGApps = true; - preFixup = '' buildPythonPath "$out $pythonPath" - wrapProgram $out/bin/sticky \ - --prefix PYTHONPATH : "$program_PYTHONPATH" \ - ''${gappsWrapperArgs[@]} + gappsWrapperArgs+=( + --prefix PYTHONPATH : "$program_PYTHONPATH" + --prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share" [ xapp-symbolic-icons ]}" + ) ''; passthru = { diff --git a/pkgs/by-name/xa/xapp-symbolic-icons/package.nix b/pkgs/by-name/xa/xapp-symbolic-icons/package.nix index f37f4125c07c..26dc86e412b5 100644 --- a/pkgs/by-name/xa/xapp-symbolic-icons/package.nix +++ b/pkgs/by-name/xa/xapp-symbolic-icons/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "xapp-symbolic-icons"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "xapp-project"; repo = "xapp-symbolic-icons"; tag = finalAttrs.version; - hash = "sha256-TOSbEcxYXuUtc0RC1Seva8uqF5qveVRq2dpG0BZmCK0="; + hash = "sha256-Z5edMCjw1/LO0+Ms5KCfFJ/iAANO2MihVZmLcJd5d3A="; }; nativeBuildInputs = [