3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #145446 from flurie/fix-ammonite-x86_64-darwin

ammonite: fix build on x86_64-darwin
This commit is contained in:
Thiago Kenji Okada 2021-11-11 01:07:13 -03:00 committed by GitHub
commit 723a982347
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,5 +1,16 @@
{ lib, stdenv, fetchurl, jre, writeScript, common-updater-scripts
, git, nixfmt, nix, coreutils, gnused, disableRemoteLogging ? true }:
{ lib
, stdenv
, fetchurl
, jre
, writeScript
, common-updater-scripts
, git
, nixfmt
, nix
, coreutils
, gnused
, disableRemoteLogging ? true
}:
with lib;
@ -61,7 +72,7 @@ let
installCheckPhase = ''
runHook preInstallCheck
$out/bin/amm -c 'val foo = 21; println(foo * 2)' | grep 42
$out/bin/amm -h "$PWD" -c 'val foo = 21; println(foo * 2)' | grep 42
runHook postInstallCheck
'';
@ -80,7 +91,8 @@ let
maintainers = [ maintainers.nequissimus ];
};
};
in {
in
{
ammonite_2_12 = common {
scalaVersion = "2.12";
sha256 = "K8JII6SAmnBjMWQ9a3NqSLLuP1OLcbwobj3G+OCiLdA=";