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

Merge pull request #31023 from yegortimoshenko/xfce4-settings/libinput 

xfce4-settings: build w/ xorg-libinput, make some dependencies optional
This commit is contained in:
Orivej Desh 2017-11-16 20:41:23 +00:00 committed by GitHub
parent 2d4dc7d0bd 28ebb17f46
commit a131ab23e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
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,17 +17,33 @@ 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
'';
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [
exo
gtk
garcon
libxfce4util
libxfce4ui
xfconf
libXi
upower
libnotify
libXcursor
xf86inputlibinput
libxklavier
]; ];
buildInputs =
[ exo gtk libxfce4util libxfce4ui libglade upower xfconf
xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon
]; #TODO: optional packages
configureFlags = [ "--enable-pluggable-dialogs" "--enable-sound-settings" ]; configureFlags = [ "--enable-pluggable-dialogs" "--enable-sound-settings" ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.xfce.org/projects/xfce4-settings; homepage = http://www.xfce.org/projects/xfce4-settings;
description = "Settings manager for Xfce"; description = "Settings manager for Xfce";
@ -34,4 +52,3 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.eelco ]; maintainers = [ maintainers.eelco ];
}; };
} }