diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-11 07:10:36 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-18 11:13:43 -0400 |
| commit | 6d7687871e5d5efc2cd706ab39e4c86f14842084 (patch) | |
| tree | eb7ed11b9e58c535a46105d44381095ee3792f2f /pkgs/applications/display-managers | |
| parent | b558eb8329d36f79cdb635aace92b5aa033eaee6 (diff) | |
lightdm-mini-greeter: use wrapGAppsHook
Diffstat (limited to 'pkgs/applications/display-managers')
| -rw-r--r-- | pkgs/applications/display-managers/lightdm-mini-greeter/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/display-managers/lightdm/gtk-greeter.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix index 69635718e3ba..ad2ac58a8b6e 100644 --- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3 }: +{ stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { pname = "lightdm-mini-greeter"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = "1qi0bsqi8z2zv3303ww0kd7bciz6qx8na5bkvgrqlwyvq31czai5"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ lightdm gtk3 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; + buildInputs = [ lightdm gtk3 glib gdk-pixbuf librsvg ]; configureFlags = [ "--sysconfdir=/etc" ]; - makeFlags = [ "configdir=$(out)/etc" ]; + makeFlags = [ "configdir=${placeholder "out"}/etc" ]; postInstall = '' substituteInPlace "$out/share/xgreeters/lightdm-mini-greeter.desktop" \ diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 0a49fa8c739e..5b1490a6b3be 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ - --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" + --replace "Exec=lightdm-gtk-greeter" "Exec=$out/bin/lightdm-gtk-greeter" ''; passthru.xgreeters = linkFarm "lightdm-gtk-greeter-xgreeters" [{ |