From b8ddb1179662624652eefdeab5cdcaf3f352a248 Mon Sep 17 00:00:00 2001 From: Cornelius Mika Date: Mon, 6 Nov 2017 10:28:49 +0100 Subject: [PATCH] use `buildCommand` for single phase builds --- home-manager/default.nix | 4 +--- modules/files.nix | 4 +--- modules/home-environment.nix | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/home-manager/default.nix b/home-manager/default.nix index 943d61e81..394f0e7f2 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -15,9 +15,7 @@ in pkgs.stdenv.mkDerivation { name = "home-manager"; - phases = [ "installPhase" ]; - - installPhase = '' + buildCommand = '' install -v -D -m755 ${./home-manager} $out/bin/home-manager substituteInPlace $out/bin/home-manager \ diff --git a/modules/files.nix b/modules/files.nix index 8871aa1a2..11d0694b5 100644 --- a/modules/files.nix +++ b/modules/files.nix @@ -264,9 +264,7 @@ in home-files = pkgs.stdenv.mkDerivation { name = "home-manager-files"; - phases = [ "installPhase" ]; - - installPhase = + buildCommand = "mkdir -p $out\n" + concatStringsSep "\n" ( mapAttrsToList (n: v: diff --git a/modules/home-environment.nix b/modules/home-environment.nix index 932f33f00..323294a37 100644 --- a/modules/home-environment.nix +++ b/modules/home-environment.nix @@ -283,9 +283,7 @@ in pkgs.stdenv.mkDerivation { name = "home-manager-generation"; - phases = [ "installPhase" ]; - - installPhase = '' + buildCommand = '' mkdir -p $out cp ${activationScript} $out/activate