diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-24 09:19:12 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-24 09:19:12 +0100 |
commit | c2eac6741bc2bf8ae5ff2e6779492dbe5829092d (patch) | |
tree | 1c423bc8330a2295281d96c4c3149c6e23b3317d /nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix | |
parent | 917f6f987aa3e0008abc0104e4655b7410da608e (diff) | |
parent | d7ba3764356317a8642b420a6c5995ed6a0e55a3 (diff) | |
download | nixpkgs-c2eac6741bc2bf8ae5ff2e6779492dbe5829092d.tar nixpkgs-c2eac6741bc2bf8ae5ff2e6779492dbe5829092d.tar.gz nixpkgs-c2eac6741bc2bf8ae5ff2e6779492dbe5829092d.tar.bz2 nixpkgs-c2eac6741bc2bf8ae5ff2e6779492dbe5829092d.tar.lz nixpkgs-c2eac6741bc2bf8ae5ff2e6779492dbe5829092d.tar.xz nixpkgs-c2eac6741bc2bf8ae5ff2e6779492dbe5829092d.tar.zst nixpkgs-c2eac6741bc2bf8ae5ff2e6779492dbe5829092d.zip |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix')
-rw-r--r-- | nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 76fb0e619d7..5b280b02423 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -18,9 +18,10 @@ let # The default greeter provided with this expression is the GTK greeter. # Again, we need a few things in the environment for the greeter to run with # fonts/icons. - wrappedGtkGreeter = pkgs.runCommand "lightdm-gtk-greeter" - { buildInputs = [ pkgs.makeWrapper ]; } - '' + wrappedGtkGreeter = pkgs.runCommand "lightdm-gtk-greeter" { + buildInputs = [ pkgs.makeWrapper ]; + preferLocalBuild = true; + } '' # This wrapper ensures that we actually get themes makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ $out/greeter \ |