From 6251d4390ca75f690311f30fbd7915c6b127f11c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 15 Jul 2007 11:16:12 +0000 Subject: [PATCH] Apache httpd customization - extraDirectories & noUserDir . svn path=/nixpkgs/trunk/; revision=8986 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77c614bf156..ad2e2dea953 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -220,8 +220,10 @@ rec { # derivations, e.g., "... ${somePkg}/bin/foo ...". writeText = name: text: runCommand name {inherit text;} "echo -n \"$text\" > $out"; + stdenvNewSetupScript = overrideSetup stdenv ../stdenv/generic/setup-new.sh; + substituteAll = import ../build-support/substitute/substitute-all.nix { - stdenv = overrideSetup stdenv ../stdenv/generic/setup-new.sh; + stdenv = stdenvNewSetupScript; }; nukeReferences = import ../build-support/nuke-references/default.nix {