From 70efcd0389aa3bbdd2ffa2753d500ca00c057ce4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 4 Apr 2015 22:20:28 -0700 Subject: [PATCH] lightdm: Remove install hack --- .../display-managers/lightdm/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index ac4d4d83c7b..79163945c0c 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -27,16 +27,10 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt" ++ stdenv.lib.optional (qt5 != null) "--enable-liblightdm-qt5"; - installFlags = [ "DESTDIR=\${out}" ]; - - # Correct for the nested nix folder tree - postInstall = '' - mv $out/$out/* $out - DIR=$out/$out - while rmdir $DIR 2>/dev/null; do - DIR="$(dirname "$DIR")" - done - ''; + installFlags = [ + "sysconfdir=\${out}/etc" + "localstatedir=\${TMPDIR}" + ]; meta = with stdenv.lib; { homepage = http://launchpad.net/lightdm;