diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-11-16 20:41:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-16 20:41:23 +0000 |
commit | a131ab23e2398ed972321596466a76e6230a0f6d (patch) | |
tree | 00715b8206fcbd45466dbbb70c9669cc906fd5b4 /pkgs/desktops/xfce | |
parent | 2d4dc7d0bd065081e27ce7b33f89a22bc4938c7f (diff) | |
parent | 28ebb17f46c5950ce8704c0b7094e44ea09c07e9 (diff) | |
download | nixlib-a131ab23e2398ed972321596466a76e6230a0f6d.tar nixlib-a131ab23e2398ed972321596466a76e6230a0f6d.tar.gz nixlib-a131ab23e2398ed972321596466a76e6230a0f6d.tar.bz2 nixlib-a131ab23e2398ed972321596466a76e6230a0f6d.tar.lz nixlib-a131ab23e2398ed972321596466a76e6230a0f6d.tar.xz nixlib-a131ab23e2398ed972321596466a76e6230a0f6d.tar.zst nixlib-a131ab23e2398ed972321596466a76e6230a0f6d.zip |
Merge pull request #31023 from yegortimoshenko/xfce4-settings/libinput
xfce4-settings: build w/ xorg-libinput, make some dependencies optional
Diffstat (limited to 'pkgs/desktops/xfce')
-rw-r--r-- | pkgs/desktops/xfce/core/xfce4-settings.nix | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix index 8e3998c05f22..592b03e8954a 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui -, libglade, xfconf, xorg, libwnck, libnotify, libxklavier, garcon, upower }: +{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, garcon, libxfce4util +, libxfce4ui, xfconf, libXi, upower ? null, libnotify ? null +, libXcursor ? null, xf86inputlibinput ? null, libxklavier ? null }: + let p_name = "xfce4-settings"; ver_maj = "4.12"; @@ -15,17 +17,33 @@ stdenv.mkDerivation rec { patches = [ ./xfce4-settings-default-icon-theme.patch ]; - nativeBuildInputs = - [ pkgconfig intltool - ]; + postPatch = '' + for f in $(find . -name \*.c); do + substituteInPlace $f --replace \"libinput-properties.h\" '<xorg/libinput-properties.h>' + done + ''; + + nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = - [ exo gtk libxfce4util libxfce4ui libglade upower xfconf - xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon - ]; #TODO: optional packages + buildInputs = [ + exo + gtk + garcon + libxfce4util + libxfce4ui + xfconf + libXi + upower + libnotify + libXcursor + xf86inputlibinput + libxklavier + ]; configureFlags = [ "--enable-pluggable-dialogs" "--enable-sound-settings" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = http://www.xfce.org/projects/xfce4-settings; description = "Settings manager for Xfce"; @@ -34,4 +52,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.eelco ]; }; } - |