diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-27 15:26:37 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-29 13:05:28 +0200 |
| commit | 75a1ec8a655e7e00a6bb6fc944663c21624fff60 (patch) | |
| tree | fcbfd398fd7e7b41f88bd3104040c12101bb8343 /nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix | |
| parent | 750195db7f369a6e73d400c0271ef2fa1e0479f0 (diff) | |
| download | nixpkgs-75a1ec8a655e7e00a6bb6fc944663c21624fff60.tar nixpkgs-75a1ec8a655e7e00a6bb6fc944663c21624fff60.tar.gz nixpkgs-75a1ec8a655e7e00a6bb6fc944663c21624fff60.tar.bz2 nixpkgs-75a1ec8a655e7e00a6bb6fc944663c21624fff60.tar.lz nixpkgs-75a1ec8a655e7e00a6bb6fc944663c21624fff60.tar.xz nixpkgs-75a1ec8a655e7e00a6bb6fc944663c21624fff60.tar.zst nixpkgs-75a1ec8a655e7e00a6bb6fc944663c21624fff60.zip | |
NixOS: Use runCommand instead of mkDerivation in a few places
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 | 9 |
1 files changed, 3 insertions, 6 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 543dd628ce6..dfda90978b1 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -16,11 +16,9 @@ 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 = stdenv.mkDerivation { - name = "lightdm-gtk-greeter"; - buildInputs = [ pkgs.makeWrapper ]; - - buildCommand = '' + wrappedGtkGreeter = pkgs.runCommand "lightdm-gtk-greeter" + { buildInputs = [ pkgs.makeWrapper ]; } + '' # This wrapper ensures that we actually get themes makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ $out/greeter \ @@ -40,7 +38,6 @@ let Type=Application EOF ''; - }; gtkGreeterConf = writeText "lightdm-gtk-greeter.conf" '' |