Merge pull request #110805 from kanashimia/master

rofi: wrap gdk-pixbuf, fixes svg icons

Sandro b50889fc 61b59f06

Changed files
+10 -3
pkgs
applications
misc
+10 -3
pkgs/applications/misc/rofi/wrapper.nix
···
-
{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, hicolor-icon-theme, theme ? null, plugins ? [] }:
+
{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, wrapGAppsHook, gdk-pixbuf, hicolor-icon-theme, theme ? null, plugins ? [] }:
symlinkJoin {
name = "rofi-${rofi-unwrapped.version}";
···
rofi-unwrapped.out
] ++ (lib.forEach plugins (p: p.out));
-
buildInputs = [ makeWrapper ];
+
nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
+
buildInputs = [ gdk-pixbuf ];
+
preferLocalBuild = true;
passthru.unwrapped = rofi-unwrapped;
+
+
dontWrapGApps = true;
+
postBuild = ''
rm -rf $out/bin
mkdir $out/bin
ln -s ${rofi-unwrapped}/bin/* $out/bin
-
rm $out/bin/rofi
+
+
gappsWrapperArgsHook
makeWrapper ${rofi-unwrapped}/bin/rofi $out/bin/rofi \
+
''${gappsWrapperArgs[@]} \
--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share \
${lib.optionalString (plugins != []) ''--prefix XDG_DATA_DIRS : ${lib.concatStringsSep ":" (lib.forEach plugins (p: "${p.out}/share"))}''} \
${lib.optionalString (theme != null) ''--add-flags "-theme ${theme}"''} \