swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-29 08:30:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #177661 from kubukoz/scala-cli-system-jvm

Browse source 
scala-cli: 0.1.7 -> 0.1.8
This commit is contained in:
Jakub Kozłowski 2022-06-15 21:59:22 +02:00 committed by GitHub
parent 0e3b49e9a6 6b0f4f603c
commit c5beb085ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/development/tools/build-managers/scala-cli/default.nix
View file

@ -1,5 +1,16 @@
{ stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl, callPackage }: { stdenv
, coreutils
, lib
, installShellFiles
, zlib
, autoPatchelfHook
, fetchurl
, makeWrapper
, callPackage
, jre
}:
assert lib.versionAtLeast jre.version "17.0.0";
let let
pname = "scala-cli"; pname = "scala-cli";
sources = builtins.fromJSON (builtins.readFile ./sources.json); sources = builtins.fromJSON (builtins.readFile ./sources.json);
@ -9,7 +20,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit pname version; inherit pname version;
nativeBuildInputs = [ installShellFiles ] nativeBuildInputs = [ installShellFiles makeWrapper ]
++ lib.optional stdenv.isLinux autoPatchelfHook; ++ lib.optional stdenv.isLinux autoPatchelfHook;
buildInputs = [ coreutils zlib stdenv.cc.cc ]; buildInputs = [ coreutils zlib stdenv.cc.cc ];
src = src =
@ -28,7 +39,9 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
install -Dm755 scala-cli $out/bin/scala-cli install -Dm755 scala-cli $out/bin/.scala-cli-wrapped
makeWrapper $out/bin/.scala-cli-wrapped $out/bin/scala-cli \
--set JAVA_HOME ${jre.home}
runHook postInstall runHook postInstall
''; '';

6
pkgs/development/tools/build-managers/scala-cli/sources.json
View file

@ -1,13 +1,13 @@
{ {
"version": "0.1.7", "version": "0.1.8",
"assets": { "assets": {
"x86_64-darwin": { "x86_64-darwin": {
"asset": "scala-cli-x86_64-apple-darwin.gz", "asset": "scala-cli-x86_64-apple-darwin.gz",
"sha256": "1sly3s9y742nms8kqwh2cikjkcnbkkafsql8sw2w2zr53z28g10v" "sha256": "1dxhwhdk7kflzn4ckqxfxkz4v26l39ki6ykpml6k6kvy3nn0wwz3"
}, },
"x86_64-linux": { "x86_64-linux": {
"asset": "scala-cli-x86_64-pc-linux.gz", "asset": "scala-cli-x86_64-pc-linux.gz",
"sha256": "1lgcbxzhwqfnj6n81w1ssdcrn1j0c93chqgh0zzqi08w8wk3x4j5" "sha256": "0hj22lcmbbfgv69k778myb0kp79gbg7xx9a3b66g3svxmanlbvxf"
} }
} }
} }