From 370cc4f44ff65dc0b58a19f523cabd9b6c1a5e0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 14 Jun 2016 11:51:04 -0300 Subject: [PATCH 1/2] libxfce4ui: use nativeBuildInputs for dependencies not needed at runtime --- pkgs/desktops/xfce/core/libxfce4ui.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index 6bdeb50f839..9cd6f99f446 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -18,8 +18,10 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" "docdev" ]; + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = - [ pkgconfig intltool gtk libxfce4util xfconf libglade + [ gtk libxfce4util xfconf libglade libstartup_notification hicolor_icon_theme ] ++ optional withGtk3 gtk3; From e72d29020c37a8630cd70073eac4d687631d0791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 14 Jun 2016 11:53:11 -0300 Subject: [PATCH 2/2] libxfce4ui: add libICE and libSM as propagated build inputs --- pkgs/desktops/xfce/core/libxfce4ui.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index 9cd6f99f446..09b400cfceb 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf +{ stdenv, fetchurl, pkgconfig, intltool, xorg, gtk, libxfce4util, xfconf , libglade, libstartup_notification, hicolor_icon_theme , withGtk3 ? false, gtk3 }: @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { libstartup_notification hicolor_icon_theme ] ++ optional withGtk3 gtk3; + propagatedBuildInputs = [ xorg.libICE xorg.libSM ]; + #TODO: glade? configureFlags = optional withGtk3 "--enable-gtk3";