diff options
Diffstat (limited to '')
| -rw-r--r-- | home-manager/default.nix | 29 | ||||
| -rw-r--r-- | modules/files.nix | 24 | ||||
| -rw-r--r-- | modules/home-environment.nix | 15 |
3 files changed, 33 insertions, 35 deletions
diff --git a/home-manager/default.nix b/home-manager/default.nix index 8a577edf117..c823e319fe5 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -12,11 +12,20 @@ let in -pkgs.stdenv.mkDerivation { - name = "home-manager"; - - buildCommand = '' - install -v -D -m755 ${./home-manager} $out/bin/home-manager +pkgs.runCommand + "home-manager" + { + preferLocalBuild = true; + allowSubstitutes = false; + meta = with pkgs.stdenv.lib; { + description = "A user environment configurator"; + maintainers = [ maintainers.rycee ]; + platforms = platforms.unix; + license = licenses.mit; + }; + } + '' + install -v -D -m755 ${./home-manager} $out/bin/home-manager substituteInPlace $out/bin/home-manager \ --subst-var-by bash "${pkgs.bash}" \ @@ -25,12 +34,4 @@ pkgs.stdenv.mkDerivation { --subst-var-by gnused "${pkgs.gnused}" \ --subst-var-by less "${pkgs.less}" \ --subst-var-by HOME_MANAGER_PATH '${pathStr}' - ''; - - meta = with pkgs.stdenv.lib; { - description = "A user environment configurator"; - maintainers = [ maintainers.rycee ]; - platforms = platforms.unix; - license = licenses.mit; - }; -} + '' diff --git a/modules/files.nix b/modules/files.nix index 1f79d5c1575..2e1171847b7 100644 --- a/modules/files.nix +++ b/modules/files.nix @@ -210,17 +210,16 @@ in '') (filter (v: v.onChange != "") (attrValues cfg)) ); - home-files = pkgs.stdenv.mkDerivation { - name = "home-manager-files"; - - nativeBuildInputs = [ pkgs.xlibs.lndir ]; - - preferLocalBuild = true; - allowSubstitutes = false; - - # Symlink directories and files that have the right execute bit. - # Copy files that need their execute bit changed. - buildCommand = '' + # Symlink directories and files that have the right execute bit. + # Copy files that need their execute bit changed. + home-files = pkgs.runCommand + "home-manager-files" + { + nativeBuildInputs = [ pkgs.xlibs.lndir ]; + preferLocalBuild = true; + allowSubstitutes = false; + } + ('' mkdir -p $out function insertFile() { @@ -279,7 +278,6 @@ in else builtins.toString v.executable}" \ "${builtins.toString v.recursive}" '') cfg - ); - }; + )); }; } diff --git a/modules/home-environment.nix b/modules/home-environment.nix index 49b8727559c..e1087f8d489 100644 --- a/modules/home-environment.nix +++ b/modules/home-environment.nix @@ -383,13 +383,13 @@ in ${activationCmds} ''; in - pkgs.stdenv.mkDerivation { - name = "home-manager-generation"; - - preferLocalBuild = true; - allowSubstitutes = false; - - buildCommand = '' + pkgs.runCommand + "home-manager-generation" + { + preferLocalBuild = true; + allowSubstitutes = false; + } + '' mkdir -p $out cp ${activationScript} $out/activate @@ -402,7 +402,6 @@ in ${cfg.extraBuilderCommands} ''; - }; home.path = pkgs.buildEnv { name = "home-manager-path"; |