diff options
| author | Yegor Timoshenko <yegortimoshenko@gmail.com> | 2017-10-31 05:17:59 +0000 |
|---|---|---|
| committer | Yegor Timoshenko <yegortimoshenko@gmail.com> | 2017-10-31 05:17:59 +0000 |
| commit | c55a0cdeb3d04232d8a4db57142862cb3f62b15b (patch) | |
| tree | 7b4948617c705c35de21c0325d31e5937e1cb26b /pkgs/desktops/xfce/core/xfce4-settings.nix | |
| parent | e2edccae47dc4972ec16bdeb6eb5374f7631fea8 (diff) | |
| download | nixlib-c55a0cdeb3d04232d8a4db57142862cb3f62b15b.tar nixlib-c55a0cdeb3d04232d8a4db57142862cb3f62b15b.tar.gz nixlib-c55a0cdeb3d04232d8a4db57142862cb3f62b15b.tar.bz2 nixlib-c55a0cdeb3d04232d8a4db57142862cb3f62b15b.tar.lz nixlib-c55a0cdeb3d04232d8a4db57142862cb3f62b15b.tar.xz nixlib-c55a0cdeb3d04232d8a4db57142862cb3f62b15b.tar.zst nixlib-c55a0cdeb3d04232d8a4db57142862cb3f62b15b.zip | |
xfce4-settings: build w/ xorg-libinput, make some dependencies optional
Closes #30148.
Diffstat (limited to 'pkgs/desktops/xfce/core/xfce4-settings.nix')
| -rw-r--r-- | pkgs/desktops/xfce/core/xfce4-settings.nix | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix index 8e3998c05f22..79ab52ec4b5c 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,14 +17,28 @@ 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" ]; @@ -34,4 +50,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.eelco ]; }; } - |