diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-06-27 13:33:05 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-09 12:44:49 +0200 |
| commit | daa66b8b1cb2ea5359f9914418350f63f0a53d7e (patch) | |
| tree | b7973e4f1a9919edcccdaa6da098c06df7286a04 /pkgs/stdenv/generic/default.nix | |
| parent | d7a4fa26b064aa294b1f52c61b02770feed6903b (diff) | |
| download | nixpkgs-daa66b8b1cb2ea5359f9914418350f63f0a53d7e.tar nixpkgs-daa66b8b1cb2ea5359f9914418350f63f0a53d7e.tar.gz nixpkgs-daa66b8b1cb2ea5359f9914418350f63f0a53d7e.tar.bz2 nixpkgs-daa66b8b1cb2ea5359f9914418350f63f0a53d7e.tar.lz nixpkgs-daa66b8b1cb2ea5359f9914418350f63f0a53d7e.tar.xz nixpkgs-daa66b8b1cb2ea5359f9914418350f63f0a53d7e.tar.zst nixpkgs-daa66b8b1cb2ea5359f9914418350f63f0a53d7e.zip | |
Factor out fixup phase stuff into separate setup hooks
Diffstat (limited to 'pkgs/stdenv/generic/default.nix')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 039ac76e406..f370aec88cf 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -31,6 +31,12 @@ let unsafeGetAttrPos = builtins.unsafeGetAttrPos or (n: as: null); + extraBuildInputs' = extraBuildInputs ++ + [ ../../build-support/setup-hooks/compress-man-pages.sh + ../../build-support/setup-hooks/strip.sh + ../../build-support/setup-hooks/patch-shebangs.sh + ]; + # The stdenv that we are producing. result = @@ -106,10 +112,10 @@ let __ignoreNulls = true; # Inputs built by the cross compiler. - buildInputs = lib.optionals (crossConfig != null) (buildInputs ++ extraBuildInputs); + buildInputs = lib.optionals (crossConfig != null) (buildInputs ++ extraBuildInputs'); propagatedBuildInputs = lib.optionals (crossConfig != null) propagatedBuildInputs; # Inputs built by the usual native compiler. - nativeBuildInputs = nativeBuildInputs ++ lib.optionals (crossConfig == null) (buildInputs ++ extraBuildInputs); + nativeBuildInputs = nativeBuildInputs ++ lib.optionals (crossConfig == null) (buildInputs ++ extraBuildInputs'); propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ lib.optionals (crossConfig == null) propagatedBuildInputs; }))) ( |