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

Merge pull request #15197 from romildo/upd.gtk-xfce-engine

Browse Source 
gtk-xfce-engine: 2.10.1 -> 3.2.0
This commit is contained in:
Arseniy Seroka 2016-05-03 22:58:02 +03:00
commit c9fb51451a
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,17 +1,19 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk }:
{ stdenv, fetchurl, pkgconfig, intltool, gtk, withGtk3 ? false, gtk3 }:
stdenv.mkDerivation rec {
p_name = "gtk-xfce-engine";
ver_maj = "2.10";
ver_min = "1";
ver_maj = "3.2";
ver_min = "0";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "4a92910205881f707f2cc8d3c9b00a95feb58eb9084d932c841f3ed027f7063d";
sha256 = "1va71f3gpl8gikfkmqsd5ikgp7qj8b64jii2l98g1ylnv8xrqp47";
};
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/;

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 { };
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 { };