diff options
| author | arcnmx <arcnmx@users.noreply.github.com> | 2019-04-02 21:21:38 -0700 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2019-04-06 18:48:29 +0200 |
| commit | 2c07829be2bcae55e04997b19719ff902a44016d (patch) | |
| tree | e3b84d78bb4123f1b867a3704aed43f48a6797b8 /home-manager | |
| parent | 652c69424411e332fb9caaa6e1d8ee05aff90af4 (diff) | |
home-manager: use `callPackage` where appropriate
Diffstat (limited to 'home-manager')
| -rw-r--r-- | home-manager/default.nix | 16 | ||||
| -rw-r--r-- | home-manager/install.nix | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/home-manager/default.nix b/home-manager/default.nix index c823e319fe5..82acb2fab63 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -1,4 +1,4 @@ -{ pkgs +{ runCommand, lib, bash, coreutils, findutils, gnused, less # Extra path to Home Manager. If set then this path will be tried # before `$HOME/.config/nixpkgs/home-manager` and @@ -12,12 +12,12 @@ let in -pkgs.runCommand +runCommand "home-manager" { preferLocalBuild = true; allowSubstitutes = false; - meta = with pkgs.stdenv.lib; { + meta = with lib; { description = "A user environment configurator"; maintainers = [ maintainers.rycee ]; platforms = platforms.unix; @@ -28,10 +28,10 @@ pkgs.runCommand install -v -D -m755 ${./home-manager} $out/bin/home-manager substituteInPlace $out/bin/home-manager \ - --subst-var-by bash "${pkgs.bash}" \ - --subst-var-by coreutils "${pkgs.coreutils}" \ - --subst-var-by findutils "${pkgs.findutils}" \ - --subst-var-by gnused "${pkgs.gnused}" \ - --subst-var-by less "${pkgs.less}" \ + --subst-var-by bash "${bash}" \ + --subst-var-by coreutils "${coreutils}" \ + --subst-var-by findutils "${findutils}" \ + --subst-var-by gnused "${gnused}" \ + --subst-var-by less "${less}" \ --subst-var-by HOME_MANAGER_PATH '${pathStr}' '' diff --git a/home-manager/install.nix b/home-manager/install.nix index 28ffe221bad..8abf6af9e15 100644 --- a/home-manager/install.nix +++ b/home-manager/install.nix @@ -1,6 +1,6 @@ -{ home-manager, pkgs }: +{ home-manager, runCommand }: -pkgs.runCommand +runCommand "home-manager-install" { propagatedBuildInputs = [ home-manager ]; |