diff options
| author | volth <volth@webmaster.ms> | 2018-07-17 23:14:54 +0000 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-07-18 01:14:54 +0200 |
| commit | 03044459961206d878abf3ae3d990546c0067ae3 (patch) | |
| tree | 383d006d113b5f67927f1e93dbafcbfc2de670c8 /pkgs/desktops/xfce | |
| parent | c2e4b04d297562190b10a8c6d72ac1f3d1003964 (diff) | |
| download | nixlib-03044459961206d878abf3ae3d990546c0067ae3.tar nixlib-03044459961206d878abf3ae3d990546c0067ae3.tar.gz nixlib-03044459961206d878abf3ae3d990546c0067ae3.tar.bz2 nixlib-03044459961206d878abf3ae3d990546c0067ae3.tar.lz nixlib-03044459961206d878abf3ae3d990546c0067ae3.tar.xz nixlib-03044459961206d878abf3ae3d990546c0067ae3.tar.zst nixlib-03044459961206d878abf3ae3d990546c0067ae3.zip | |
xfce.gtk-xfce-engine: fix build when withGtk3=true (#43621)
Diffstat (limited to 'pkgs/desktops/xfce')
| -rw-r--r-- | pkgs/desktops/xfce/core/gtk-xfce-engine.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix index c4b2366e7870..0d69d4d2f32b 100644 --- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix +++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, withGtk3 ? false, gtk3 }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk2, withGtk3 ? false, gtk3 ? null }: + +assert withGtk3 -> (gtk3 != null); stdenv.mkDerivation rec { p_name = "gtk-xfce-engine"; @@ -12,8 +14,11 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk ] ++ stdenv.lib.optional withGtk3 gtk3; - + buildInputs = [ intltool gtk2 ] ++ stdenv.lib.optional withGtk3 gtk3; + + # `glib-mkenums' is unhappy that some source files are not valid UTF-8 + postPatch = ''find . -type f -name '*.[ch]' -exec sed -r -i 's/\xD6/O/g' {} +''; + configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; meta = { |