diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-07-21 11:13:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-21 11:13:36 +0200 |
commit | 251a0a9a861a88b17c44fbec1c2b12402837cfca (patch) | |
tree | 5d2ad3999e5f3479f6be84e8b76105d7cf6dab22 /nixos/modules/services/x11 | |
parent | 7db4c3617ff4e7a0d88320952e320599e75b39db (diff) | |
parent | 6d2857a311a6586860cb0c70778b035c92d9c88c (diff) | |
download | nixpkgs-251a0a9a861a88b17c44fbec1c2b12402837cfca.tar nixpkgs-251a0a9a861a88b17c44fbec1c2b12402837cfca.tar.gz nixpkgs-251a0a9a861a88b17c44fbec1c2b12402837cfca.tar.bz2 nixpkgs-251a0a9a861a88b17c44fbec1c2b12402837cfca.tar.lz nixpkgs-251a0a9a861a88b17c44fbec1c2b12402837cfca.tar.xz nixpkgs-251a0a9a861a88b17c44fbec1c2b12402837cfca.tar.zst nixpkgs-251a0a9a861a88b17c44fbec1c2b12402837cfca.zip |
Merge pull request #43860 from volth/unused2
treewide: remove unused 'inherit' in let blocks
Diffstat (limited to 'nixos/modules/services/x11')
5 files changed, 3 insertions, 5 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 4b9e561d53c..17733aa7e4f 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -7,7 +7,7 @@ let xcfg = config.services.xserver; cfg = xcfg.desktopManager.plasma5; - inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg; + inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5; in 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 2a71d233860..385f20b7e06 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -8,7 +8,7 @@ let ldmcfg = dmcfg.lightdm; cfg = ldmcfg.greeters.gtk; - inherit (pkgs) stdenv lightdm writeScript writeText; + inherit (pkgs) writeText; theme = cfg.theme.package; icons = cfg.iconTheme.package; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 206ede227ef..54d4520a0c8 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -13,7 +13,7 @@ let wmDefault = xcfg.windowManager.default; hasDefaultUserSession = dmDefault != "none" || wmDefault != "none"; - inherit (pkgs) stdenv lightdm writeScript writeText; + inherit (pkgs) lightdm writeScript writeText; # lightdm runs with clearenv(), but we need a few things in the enviornment for X to startup xserverWrapper = writeScript "xserver-wrapper" diff --git a/nixos/modules/services/x11/window-managers/openbox.nix b/nixos/modules/services/x11/window-managers/openbox.nix index 07ef77151e9..165772d1aa0 100644 --- a/nixos/modules/services/x11/window-managers/openbox.nix +++ b/nixos/modules/services/x11/window-managers/openbox.nix @@ -2,7 +2,6 @@ with lib; let - inherit (lib) mkOption mkIf; cfg = config.services.xserver.windowManager.openbox; in diff --git a/nixos/modules/services/x11/window-managers/wmii.nix b/nixos/modules/services/x11/window-managers/wmii.nix index 30c8df78224..eec6f2b2b81 100644 --- a/nixos/modules/services/x11/window-managers/wmii.nix +++ b/nixos/modules/services/x11/window-managers/wmii.nix @@ -2,7 +2,6 @@ with lib; let - inherit (lib) mkOption mkIf singleton; cfg = config.services.xserver.windowManager.wmii; wmii = pkgs.wmii_hg; in |