From da613b5c803a1cdacf65a34e70d86115accc902b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jul 2019 14:22:58 +0200 Subject: [PATCH] Revert "mkShell: compose shellHooks" This reverts commit 000463186d471107324c67faecb5c85e9f06521a. https://github.com/NixOS/nixpkgs/pull/63718#issuecomment-507240192 --- pkgs/build-support/mkshell/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/build-support/mkshell/default.nix index a70dc0390cb5..20f8cb760e8e 100644 --- a/pkgs/build-support/mkshell/default.nix +++ b/pkgs/build-support/mkshell/default.nix @@ -20,7 +20,6 @@ let "nativeBuildInputs" "propagatedBuildInputs" "propagatedNativeBuildInputs" - "shellHook" ]; in @@ -33,9 +32,6 @@ stdenv.mkDerivation ({ propagatedBuildInputs = mergeInputs "propagatedBuildInputs"; propagatedNativeBuildInputs = mergeInputs "propagatedNativeBuildInputs"; - shellHook = lib.concatStringsSep "\n" (lib.catAttrs "shellHook" - (lib.reverseList inputsFrom ++ [attrs])); - nobuildPhase = '' echo echo "This derivation is not meant to be built, aborting";