Merge pull request #31024 from yegortimoshenko/xfce4-panel/gettext

xfce4-panel: patch gettext in xfce4-popup-* scripts, fixes #30033

authored by Orivej Desh and committed by GitHub a368bbb5 a131ab23

+7 -2
+7 -2
pkgs/desktops/xfce/core/xfce4-panel.nix
··· 1 { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui 2 , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification 3 , makeWrapper, xfce4mixer, hicolor_icon_theme 4 - , withGtk3 ? false, gtk3 5 }: 6 let 7 inherit (stdenv.lib) optional; ··· 19 20 patches = [ ./xfce4-panel-datadir.patch ]; 21 patchFlags = "-p1"; 22 23 outputs = [ "out" "dev" "devdoc" ]; 24 ··· 47 maintainers = [ maintainers.eelco ]; 48 }; 49 } 50 -
··· 1 { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui 2 , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification 3 , makeWrapper, xfce4mixer, hicolor_icon_theme 4 + , withGtk3 ? false, gtk3, gettext 5 }: 6 let 7 inherit (stdenv.lib) optional; ··· 19 20 patches = [ ./xfce4-panel-datadir.patch ]; 21 patchFlags = "-p1"; 22 + 23 + postPatch = '' 24 + for f in $(find . -name \*.sh); do 25 + substituteInPlace $f --replace gettext ${gettext}/bin/gettext 26 + done 27 + ''; 28 29 outputs = [ "out" "dev" "devdoc" ]; 30 ··· 53 maintainers = [ maintainers.eelco ]; 54 }; 55 }