Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a131ab23e239
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a368bbb57dd6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 31, 2017

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

    @lukateras
    lukateras committed Oct 31, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    GPG key ID: D02435D05B810C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bd4c668 View commit details

Commits on Nov 16, 2017

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

    xfce4-panel: patch gettext in xfce4-popup-* scripts, fixes #30033
    @orivej
    orivej authored Nov 16, 2017
    Copy the full SHA
    a368bbb View commit details
Showing with 7 additions and 2 deletions.
  1. +7 −2 pkgs/desktops/xfce/core/xfce4-panel.nix
9 changes: 7 additions & 2 deletions pkgs/desktops/xfce/core/xfce4-panel.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
, libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification
, makeWrapper, xfce4mixer, hicolor_icon_theme
, withGtk3 ? false, gtk3
, withGtk3 ? false, gtk3, gettext
}:
let
inherit (stdenv.lib) optional;
@@ -20,6 +20,12 @@ stdenv.mkDerivation rec {
patches = [ ./xfce4-panel-datadir.patch ];
patchFlags = "-p1";

postPatch = ''
for f in $(find . -name \*.sh); do
substituteInPlace $f --replace gettext ${gettext}/bin/gettext
done
'';

outputs = [ "out" "dev" "devdoc" ];

buildInputs =
@@ -47,4 +53,3 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.eelco ];
};
}