From 888e22cbd94fe27fa10500d58fe4c3c73e16ee3d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 21 May 2018 21:36:52 -0400 Subject: [PATCH] ammonite: 1.1.0 -> 1.1.2 --- pkgs/development/tools/ammonite/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index beebd8ada9b..f139e296d35 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -1,20 +1,20 @@ -{ stdenv, lib, fetchurl, makeWrapper, jre +{ stdenv, lib, fetchurl, makeWrapper, jre, gnused , disableRemoteLogging ? true }: with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.1.0"; + version = "1.1.2"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "0dx5w1ffnqazsyp6zxrmfcn7yhkkd81h7njwbqqv1pbchj5znj6l"; + sha256 = "1balr7ya7xlyq32jwb0w9c4klnw13mdn2c5azkwngq5cp29yrfrc"; }; propagatedBuildInputs = [ jre ] ; - buildInputs = [ makeWrapper ] ; + buildInputs = [ makeWrapper gnused ] ; phases = "installPhase"; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp ${src} $out/bin/amm chmod +x $out/bin/amm - wrapProgram $out/bin/amm \ - ${optionalString disableRemoteLogging "--add-flags --no-remote-logging"} \ - --prefix PATH ":" ${jre}/bin ; + ${gnused}/bin/sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm + '' + optionalString (disableRemoteLogging) '' + ${gnused}/bin/sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm ''; meta = {