diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-03-02 22:33:53 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-03-02 22:38:04 +0000 |
commit | 07ecf87693fec1032c19ba1f5b41dc9cf260abb2 (patch) | |
tree | c55bf149fdf281c1ce997f97816065ab96cd52fb /pkgs/development | |
parent | 4f6ec19dbc322d7ce8df9108b76e0db79682353e (diff) |
treewide: Fix various tools wrappers "with packages"
Now that `buildEnv` is ready, always put `makeWrapper` in `nativeBuildInputs`, rather than `buildInputs` or (worse) mucking around with setup hooks by hand. (C.f. #112276, which didn't catch these because the manual setup hook sourcing is such a hack to being with!) Fixes #114687
Diffstat (limited to 'pkgs/development')
4 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 32fa46fd04ace..0e566aa2e6e4d 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -57,9 +57,8 @@ symlinkJoin { # as a dedicated drv attribute, like `compiler-name` name = ghc.name + "-with-packages"; paths = paths ++ [ghc]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' - . ${makeWrapper}/nix-support/setup-hook - # wrap compiler executables with correct env variables for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do diff --git a/pkgs/development/interpreters/octave/build-env.nix b/pkgs/development/interpreters/octave/build-env.nix index fee53b716daef..433026f0a7e9b 100644 --- a/pkgs/development/interpreters/octave/build-env.nix +++ b/pkgs/development/interpreters/octave/build-env.nix @@ -20,17 +20,14 @@ in buildEnv { inherit ignoreCollisions; extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; - buildInputs = [ makeWrapper texinfo wrapOctave ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ texinfo wrapOctave ]; # During "build" we must first unlink the /share symlink to octave's /share # Then, we can re-symlink the all of octave/share, except for /share/octave # in env/share/octave, re-symlink everything from octave/share/octave and then # perform the pkg install. postBuild = '' - . "${makeWrapper}/nix-support/setup-hook" - # The `makeWrapper` used here is the one defined in - # ${makeWrapper}/nix-support/setup-hook - if [ -L "$out/bin" ]; then unlink $out/bin mkdir -p "$out/bin" diff --git a/pkgs/development/interpreters/perl/wrapper.nix b/pkgs/development/interpreters/perl/wrapper.nix index da95b5a896477..e1909a15e059f 100644 --- a/pkgs/development/interpreters/perl/wrapper.nix +++ b/pkgs/development/interpreters/perl/wrapper.nix @@ -17,11 +17,10 @@ let inherit ignoreCollisions; extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; + nativeBuildInputs = [ makeWrapper ]; + # we create wrapper for the binaries in the different packages postBuild = '' - - . "${makeWrapper}/nix-support/setup-hook" - if [ -L "$out/bin" ]; then unlink "$out/bin" fi diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 61ad4a8a6ad9e..514930db359b0 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,10 +1,15 @@ -{ lib, stdenv, python, buildEnv, makeWrapper +{ lib, stdenv, buildEnv, makeWrapper + +# manually pased +, python +, requiredPythonModules + +# extra opts , extraLibs ? [] , extraOutputsToInstall ? [] , postBuild ? "" , ignoreCollisions ? false , permitUserSite ? false -, requiredPythonModules # Wrap executables with the given argument. , makeWrapperArgs ? [] , }: @@ -22,9 +27,9 @@ let inherit ignoreCollisions; extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; - postBuild = '' - . "${makeWrapper}/nix-support/setup-hook" + nativeBuildInputs = [ makeWrapper ]; + postBuild = '' if [ -L "$out/bin" ]; then unlink "$out/bin" fi |