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

xfce4-14.xfce4-session: dbus-glib -> GDBus, cleanups

Browse Source 
Dropped replacing PATH because upstream had us in mind [0].

[0]: fd46109d05
This commit is contained in:
worldofpeace 2019-08-16 23:34:01 -04:00
parent 711f0b39e4
commit b70a8b1f0e
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/desktops/xfce4-14/xfce4-session/default.nix
View File

@ -1,4 +1,4 @@
{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, dbus-glib, dbus, iceauth, gtk3, libwnck3, xorg }: { mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg }:
mkXfceDerivation rec { mkXfceDerivation rec {
category = "xfce"; category = "xfce";
@ -7,19 +7,12 @@ mkXfceDerivation rec {
sha256 = "0v0xzkdr5rgv6219c1dy96cghgw8bqnb313jccxihfgddf363104"; sha256 = "0v0xzkdr5rgv6219c1dy96cghgw8bqnb313jccxihfgddf363104";
buildInputs = [ exo dbus-glib dbus gtk3 libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ]; buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ];
configureFlags = [ "--with-xsession-prefix=$(out)" ]; configureFlags = [ "--with-xsession-prefix=${placeholder ''out''}" ];
NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0" # See https://github.com/NixOS/nixpkgs/issues/36468
"-I${dbus.dev}/include/dbus-1.0" NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
"-I${dbus.lib}/lib/dbus-1.0/include"
];
postPatch = ''
substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0
substituteInPlace scripts/xflock4 --replace PATH=/bin:/usr/bin "PATH=\$PATH:$out/bin:${xorg.xset}/bin"
'';
meta = { meta = {
description = "Session manager for Xfce"; description = "Session manager for Xfce";