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: 006a699e693d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 88cd06d0f22c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 13, 2019

  1. lightdm_gtk_greeter: fix configureFlags to not be one long string 

    For whatever reason, setting `configureFlagsArray` causes
the configure invocation to escape spaces between parameters:

configure flags: --disable-static --disable-dependency-tracking --prefix=/nix/store/4bn8dsr743dp0g5j020jf8why5hkld3p-lightdm-gtk-greeter-2.0.6 --localstatedir=/var\ --sysconfdir=/etc\ --disable-indicator-services-command\ --enable-at-spi-command=/nix/store/li9bsxl8qja8qw0pa70xd572gw5hqsdm-at-spi2-core-2.30.1/libexec/at-spi-bus-launcher\ \ --launch-immediately

This actually doesn't break the build (!) but it does break
lightdm pretty badly for me and it's not hard to imagine why :).

Instead, use configureFlags as normal but just append the command
in `preConfigure` directly, so we can preserve the space.
    @dtzWill
    dtzWill committed Mar 13, 2019
    Copy the full SHA
    7971975 View commit details

  2. Merge pull request #57560 from dtzWill/fix/lightdm-gtk-greeter-config… 

    …ureFlags

lightdm_gtk_greeter: fix configureFlags to not be one long string
    @dtzWill
    dtzWill authored Mar 13, 2019
    Copy the full SHA
    88cd06d View commit details
Showing with 6 additions and 3 deletions.
  1. +6 −3 pkgs/applications/display-managers/lightdm/gtk-greeter.nix
9 changes: 6 additions & 3 deletions pkgs/applications/display-managers/lightdm/gtk-greeter.nix
View file
Original file line number Diff line number Diff line change
@@ -23,18 +23,21 @@ stdenv.mkDerivation rec {
buildInputs = [ lightdm exo intltool makeWrapper hicolor-icon-theme ]
++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]);

configureFlagsArray = [
configureFlags = [
"--localstatedir=/var"
"--sysconfdir=/etc"
"--disable-indicator-services-command"
"--enable-at-spi-command=${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately"
] ++ 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" ];

installFlags = [
"localstatedir=\${TMPDIR}"
"sysconfdir=\${out}/etc"
"sysconfdir=${placeholder "out"}/etc"
];

postInstall = ''