From 34c058ef850de17750656ae3c0c0dcb848fb52b4 Mon Sep 17 00:00:00 2001 From: flurie Date: Wed, 10 Nov 2021 20:55:38 -0500 Subject: [PATCH] ammonite: fix build on x86_64-darwin --- pkgs/development/tools/ammonite/default.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 157ee78d53cc..7f189e83e195 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -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=";