colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sbt-with-scala-native: use overrideAttrs to fix nativeBuildInputs splicing

Browse Source 
preserve old nativeBuildInputs which includes autoPatchelfHook which was
not there when this override was added

drop the `sha256` and `version` overrides which have never worked
properly because they haven't been overriding src.

`sha256` and `version` were added in 49c7bed763
This commit is contained in:
Artturin 2023-08-15 01:32:58 +03:00
parent 88b60b61b9
commit aae9f2ca22
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/build-managers/sbt/scala-native.nix
View File

@ -1,13 +1,9 @@
{ lib, sbt, makeWrapper, boehmgc, libunwind, re2, llvmPackages, zlib }:
sbt.overrideDerivation(old: {
nativeBuildInputs = [ makeWrapper ];
sbt.overrideAttrs(previousAttrs: {
nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ makeWrapper ];
version = "0.13.16";
sha256 = "033nvklclvbirhpsiy28d3ccmbm26zcs9vb7j8jndsc1ln09awi2";
postFixup = ''
postFixup = (previousAttrs.postFixup or "") + ''
wrapProgram $out/bin/sbt \
--set CLANG_PATH "${llvmPackages.clang}/bin/clang" \
--set CLANGPP_PATH "${llvmPackages.clang}/bin/clang" \