mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-18 00:49:52 +00:00
Code Issues Wiki Activity

Merge pull request #57560 from dtzWill/fix/lightdm-gtk-greeter-configureFlags

Browse source 
lightdm_gtk_greeter: fix configureFlags to not be one long string
This commit is contained in:
Will Dietz 2019-03-13 11:25:02 -05:00 committed by GitHub
parent 006a699e69 7971975f29
commit 88cd06d0f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/display-managers/lightdm/gtk-greeter.nix
View file

@ -23,18 +23,21 @@ 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 ]);
configureFlagsArray = [ configureFlags = [
"--localstatedir=/var" "--localstatedir=/var"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--disable-indicator-services-command" "--disable-indicator-services-command"
"--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";
preConfigure = ''
configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" )
'';
NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ];
installFlags = [ installFlags = [
"localstatedir=\${TMPDIR}" "localstatedir=\${TMPDIR}"
"sysconfdir=\${out}/etc" "sysconfdir=${placeholder "out"}/etc"
]; ];
postInstall = '' postInstall = ''