From aae9f2ca22efe20369bfbd74561bbdaa61e5d381 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 15 Aug 2023 01:32:58 +0300 Subject: [PATCH] sbt-with-scala-native: use `overrideAttrs` to fix `nativeBuildInputs` splicing 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 49c7bed76385ab46d5e0f76b2f26f17a2c7d3658 --- .../tools/build-managers/sbt/scala-native.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/scala-native.nix b/pkgs/development/tools/build-managers/sbt/scala-native.nix index 70038ed2d3a4..caa9feebb519 100644 --- a/pkgs/development/tools/build-managers/sbt/scala-native.nix +++ b/pkgs/development/tools/build-managers/sbt/scala-native.nix @@ -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" \