about summary refs log tree commit diff
path: root/pkgs/desktops/xfce/core/libxfce4ui.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/desktops/xfce/core/libxfce4ui.nix')
-rw-r--r--pkgs/desktops/xfce/core/libxfce4ui.nix30
1 files changed, 14 insertions, 16 deletions
diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix
index 2cb20febcb94..6bdeb50f8399 100644
--- a/pkgs/desktops/xfce/core/libxfce4ui.nix
+++ b/pkgs/desktops/xfce/core/libxfce4ui.nix
@@ -1,40 +1,38 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf
-, libglade, libstartup_notification
+, libglade, libstartup_notification, hicolor_icon_theme
 , withGtk3 ? false, gtk3
 }:
-
-with { inherit (stdenv.lib) optional; };
-
-stdenv.mkDerivation rec {
+let
   p_name  = "libxfce4ui";
   ver_maj = "4.12";
   ver_min = "1";
+  inherit (stdenv.lib) optional;
+in
+stdenv.mkDerivation rec {
+  name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
     sha256 = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43";
   };
-  name = "${p_name}-${ver_maj}.${ver_min}";
 
-  #TODO: gladeui
-  # Install into our own prefix instead.
-  configureFlags = [
-    "--with-libglade-module-path=$out/lib/libglade/2.0"
-  ] ++ optional withGtk3 "--enable-gtk3";
+  outputs = [ "dev" "out" "docdev" ];
 
   buildInputs =
     [ pkgconfig intltool gtk libxfce4util xfconf libglade
-      libstartup_notification
+      libstartup_notification hicolor_icon_theme
     ] ++ optional withGtk3 gtk3;
 
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
+  #TODO: glade?
+  configureFlags = optional withGtk3 "--enable-gtk3";
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.xfce.org/;
     description = "Basic GUI library for Xfce";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
   };
 }
+