public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gtk-xfce-engine: add support to Gtk3

This commit is contained in:
José Romildo Malaquias 2016-05-03 15:18:23 -03:00
parent f72a2faa28
commit f0da9ff412
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/desktops/xfce/core/gtk-xfce-engine.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk }: { stdenv, fetchurl, pkgconfig, intltool, gtk, withGtk3 ? false, gtk3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
p_name = "gtk-xfce-engine"; p_name = "gtk-xfce-engine";
@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
}; };
name = "${p_name}-${ver_maj}.${ver_min}"; 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 = { meta = {
homepage = http://www.xfce.org/; homepage = http://www.xfce.org/;

2
pkgs/desktops/xfce/default.nix
View File

@ -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 { }; exo = callPackage ./core/exo.nix { };
garcon = callPackage ./core/garcon.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 = callPackage ./core/libxfce4ui.nix { };
libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; }; libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; };
libxfce4util = callPackage ./core/libxfce4util.nix { }; libxfce4util = callPackage ./core/libxfce4util.nix { };