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/haskell-modules/with-packages-wrapper.nix | |
| 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/haskell-modules/with-packages-wrapper.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/with-packages-wrapper.nix | 3 |
1 files changed, 1 insertions, 2 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 |