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

xfce4-settings: build w/ xorg-libinput, make some dependencies optional

Browse Source 
Closes #30148.
This commit is contained in:
Yegor Timoshenko 2017-10-31 05:17:59 +00:00
parent e2edccae47
commit c55a0cdeb3
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/desktops/xfce/core/xfce4-settings.nix
View File

@ -1,5 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui { stdenv, fetchurl, pkgconfig, intltool, exo, gtk, garcon, libxfce4util
, libglade, xfconf, xorg, libwnck, libnotify, libxklavier, garcon, upower }: , libxfce4ui, xfconf, libXi, upower ? null, libnotify ? null
, libXcursor ? null, xf86inputlibinput ? null, libxklavier ? null }:
let let
p_name = "xfce4-settings"; p_name = "xfce4-settings";
ver_maj = "4.12"; ver_maj = "4.12";
@ -15,14 +17,28 @@ stdenv.mkDerivation rec {
patches = [ ./xfce4-settings-default-icon-theme.patch ]; patches = [ ./xfce4-settings-default-icon-theme.patch ];
nativeBuildInputs = postPatch = ''
[ pkgconfig intltool for f in $(find . -name \*.c); do
]; substituteInPlace $f --replace \"libinput-properties.h\" '<xorg/libinput-properties.h>'
done
'';
buildInputs = nativeBuildInputs = [ pkgconfig intltool ];
[ exo gtk libxfce4util libxfce4ui libglade upower xfconf
xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon buildInputs = [
]; #TODO: optional packages exo
gtk
garcon
libxfce4util
libxfce4ui
xfconf
libXi
upower
libnotify
libXcursor
xf86inputlibinput
libxklavier
];
configureFlags = [ "--enable-pluggable-dialogs" "--enable-sound-settings" ]; configureFlags = [ "--enable-pluggable-dialogs" "--enable-sound-settings" ];
@ -34,4 +50,3 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.eelco ]; maintainers = [ maintainers.eelco ];
}; };
} }