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

lightdm_gtk_greeter: correct at-spi-command

Browse Source 
Without manually setting the command with the
flag, it's hardcoded to some FHS path.
This commit is contained in:
worldofpeace 2019-03-11 18:05:57 -04:00
parent a6000c05b1
commit b5cac7566f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/display-managers/lightdm/gtk-greeter.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, lightdm, pkgconfig, intltool { stdenv, fetchurl, lightdm, pkgconfig, intltool
, hicolor-icon-theme, makeWrapper , hicolor-icon-theme, makeWrapper
, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported , useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported
, exo , exo, at-spi2-core
}: }:
#ToDo: bad icons with gtk2; #ToDo: bad icons with gtk2;
@ -23,9 +23,10 @@ stdenv.mkDerivation rec {
buildInputs = [ lightdm exo intltool makeWrapper hicolor-icon-theme ] buildInputs = [ lightdm exo intltool makeWrapper hicolor-icon-theme ]
++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]);
configureFlags = [ configureFlagsArray = [
"--localstatedir=/var" "--localstatedir=/var"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--enable-at-spi-command=${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately"
] ++ stdenv.lib.optional useGTK2 "--with-gtk2"; ] ++ stdenv.lib.optional useGTK2 "--with-gtk2";
NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ];