From 29a343656b837a0ef23f95443185e2be5ed2d851 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 9 Mar 2015 18:42:39 -0700 Subject: [PATCH] lightdm-gtk-greeter: More fixes --- .../display-managers/lightdm-gtk-greeter/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index 3ad367dc0586..176888328a5c 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { sha256 = "1134q8qd7gr34jkivqxckdnwbpa8pl7dhjpdi9fci0pcs4hh22jc"; }; - buildInputs = [ pkgconfig lightdm intltool ] - ++ (if useGTK2 then [ gtk2 makeWrapper ] else [ gtk3 ]); + buildInputs = [ pkgconfig lightdm intltool makeWrapper ] + ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); configureFlags = [ "--localstatedir=/var" @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" - '' + stdenv.lib.optionalString useGTK2 '' wrapProgram "$out/sbin/lightdm-gtk-greeter" \ --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" '';