From 858da643687da2f9803fd4e4902ae1e6a3a85154 Mon Sep 17 00:00:00 2001 From: Cornelius Mika Date: Wed, 6 Sep 2017 10:17:30 +0200 Subject: [PATCH] use buildCommand for single phase builds --- home-manager/default.nix | 4 +--- modules/home-environment.nix | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/home-manager/default.nix b/home-manager/default.nix index bb098869..2a27ae82 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/home-environment.nix b/modules/home-environment.nix index d0f7b6e1..ec736b20 100644 --- a/modules/home-environment.nix +++ b/modules/home-environment.nix @@ -410,9 +410,7 @@ in home-files = pkgs.stdenv.mkDerivation { name = "home-manager-files"; - phases = [ "installPhase" ]; - - installPhase = + buildCommand = "mkdir -p $out\n" + concatStringsSep "\n" ( mapAttrsToList (n: v: @@ -431,9 +429,7 @@ in pkgs.stdenv.mkDerivation { name = "home-manager-generation"; - phases = [ "installPhase" ]; - - installPhase = '' + buildCommand = '' install -D ${activationScript} $out/activate substituteInPlace $out/activate \