Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2d4dc7d0bd06
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a131ab23e239
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 31, 2017

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

    Closes #30148.
    @lukateras
    lukateras committed Oct 31, 2017
    Copy the full SHA
    c55a0cd View commit details

Commits on Nov 16, 2017

  1. xfce4-settings: enable parallel building

    @orivej
    orivej committed Nov 16, 2017
    Copy the full SHA
    28ebb17 View commit details

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

    xfce4-settings: build w/ xorg-libinput, make some dependencies optional
    @orivej
    orivej authored Nov 16, 2017
    Copy the full SHA
    a131ab2 View commit details
Showing with 27 additions and 10 deletions.
  1. +27 −10 pkgs/desktops/xfce/core/xfce4-settings.nix
37 changes: 27 additions & 10 deletions pkgs/desktops/xfce/core/xfce4-settings.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
};
}