pyrox.dev
Merge pull request #31023 from yegortimoshenko/xfce4-settings/libinput
xfce4-settings: build w/ xorg-libinput, make some dependencies optional
authored by Orivej Desh and committed by GitHub a131ab23 2d4dc7d0
+27
-10
pkgs/desktops/xfce/core/xfce4-settings.nix
+27
-10
pkgs/desktops/xfce/core/xfce4-settings.nix
···
1
-
{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
2
-
, libglade, xfconf, xorg, libwnck, libnotify, libxklavier, garcon, upower }:
1
+
{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, garcon, libxfce4util
2
+
, libxfce4ui, xfconf, libXi, upower ? null, libnotify ? null
3
+
, libXcursor ? null, xf86inputlibinput ? null, libxklavier ? null }:
4
+
3
5
let
4
6
p_name = "xfce4-settings";
5
7
ver_maj = "4.12";
···
15
17
16
18
patches = [ ./xfce4-settings-default-icon-theme.patch ];
17
19
18
-
nativeBuildInputs =
19
-
[ pkgconfig intltool
20
-
];
20
+
postPatch = ''
21
+
for f in $(find . -name \*.c); do
22
+
substituteInPlace $f --replace \"libinput-properties.h\" '<xorg/libinput-properties.h>'
23
+
done
24
+
'';
25
+
26
+
nativeBuildInputs = [ pkgconfig intltool ];
21
27
22
-
buildInputs =
23
-
[ exo gtk libxfce4util libxfce4ui libglade upower xfconf
24
-
xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon
25
-
]; #TODO: optional packages
28
+
buildInputs = [
29
+
exo
30
+
gtk
31
+
garcon
32
+
libxfce4util
33
+
libxfce4ui
34
+
xfconf
35
+
libXi
36
+
upower
37
+
libnotify
38
+
libXcursor
39
+
xf86inputlibinput
40
+
libxklavier
41
+
];
26
42
27
43
configureFlags = [ "--enable-pluggable-dialogs" "--enable-sound-settings" ];
44
+
45
+
enableParallelBuilding = true;
28
46
29
47
meta = with stdenv.lib; {
30
48
homepage = http://www.xfce.org/projects/xfce4-settings;
···
34
52
maintainers = [ maintainers.eelco ];
35
53
};
36
54
}
37
-