diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-04-04 22:22:08 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-04-04 22:22:08 -0700 |
| commit | 904f24577b87563f97312547aac617b1f233665f (patch) | |
| tree | 2d1585b4deba32018ab99114fac5285b48474c60 | |
| parent | 70efcd0389aa3bbdd2ffa2753d500ca00c057ce4 (diff) | |
| download | nixpkgs-904f24577b87563f97312547aac617b1f233665f.tar nixpkgs-904f24577b87563f97312547aac617b1f233665f.tar.gz nixpkgs-904f24577b87563f97312547aac617b1f233665f.tar.bz2 nixpkgs-904f24577b87563f97312547aac617b1f233665f.tar.lz nixpkgs-904f24577b87563f97312547aac617b1f233665f.tar.xz nixpkgs-904f24577b87563f97312547aac617b1f233665f.tar.zst nixpkgs-904f24577b87563f97312547aac617b1f233665f.zip | |
lightdm-gtk-greeter: Remove install hack
| -rw-r--r-- | pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index 171fefc8a09..2ae6b2aeb26 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -26,20 +26,17 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" ] ++ stdenv.lib.optional useGTK2 "--with-gtk2"; - installFlags = [ "DESTDIR=\${out}" ]; + installFlags = [ + "localstatedir=\${TMPDIR}" + "sysconfdir=\${out}/etc" + ]; postInstall = '' - mv $out/$out/* $out - DIR=$out/$out - while rmdir $DIR 2>/dev/null; do - DIR="$(dirname "$DIR")" - done - - substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ - --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" - wrapProgram "$out/sbin/lightdm-gtk-greeter" \ - --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" - ''; + substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ + --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" + wrapProgram "$out/sbin/lightdm-gtk-greeter" \ + --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" + ''; meta = with stdenv.lib; { homepage = http://launchpad.net/lightdm-gtk-greeter; |