diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2016-05-03 15:18:23 -0300 |
|---|---|---|
| committer | José Romildo Malaquias <malaquias@gmail.com> | 2016-05-03 15:18:23 -0300 |
| commit | f0da9ff4128c1c4d3fbee2c4691adcac4bc24e6f (patch) | |
| tree | bbfbc344210ddc05e0c5052c4d28cd13e3b655c3 /pkgs/desktops/xfce | |
| parent | f72a2faa28580c6a19b5cc3a111f4a198f1a80fc (diff) | |
| download | nixlib-f0da9ff4128c1c4d3fbee2c4691adcac4bc24e6f.tar nixlib-f0da9ff4128c1c4d3fbee2c4691adcac4bc24e6f.tar.gz nixlib-f0da9ff4128c1c4d3fbee2c4691adcac4bc24e6f.tar.bz2 nixlib-f0da9ff4128c1c4d3fbee2c4691adcac4bc24e6f.tar.lz nixlib-f0da9ff4128c1c4d3fbee2c4691adcac4bc24e6f.tar.xz nixlib-f0da9ff4128c1c4d3fbee2c4691adcac4bc24e6f.tar.zst nixlib-f0da9ff4128c1c4d3fbee2c4691adcac4bc24e6f.zip | |
gtk-xfce-engine: add support to Gtk3
Diffstat (limited to 'pkgs/desktops/xfce')
| -rw-r--r-- | pkgs/desktops/xfce/core/gtk-xfce-engine.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/xfce/default.nix | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix index 25ba1e252d46..6e5ac7c55ea1 100644 --- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix +++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk, withGtk3 ? false, gtk3 }: stdenv.mkDerivation rec { p_name = "gtk-xfce-engine"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool gtk ]; + buildInputs = [ pkgconfig intltool gtk ] ++ stdenv.lib.optional withGtk3 gtk3; + + configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; meta = { homepage = http://www.xfce.org/; diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 96e6c55162a5..3ea3721362bc 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -21,7 +21,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od exo = callPackage ./core/exo.nix { }; garcon = callPackage ./core/garcon.nix { }; - gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { }; # ToDo: when should be used? + gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { withGtk3 = true; }; # ToDo: when should be used? libxfce4ui = callPackage ./core/libxfce4ui.nix { }; libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; }; libxfce4util = callPackage ./core/libxfce4util.nix { }; |