diff --git a/pkgs/development/interpreters/alda/default.nix b/pkgs/development/interpreters/alda/default.nix index 96d4207dbe8f8..9a69bb1caa5bf 100644 --- a/pkgs/development/interpreters/alda/default.nix +++ b/pkgs/development/interpreters/alda/default.nix @@ -1,20 +1,33 @@ -{ lib, stdenv, fetchurl, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { pname = "alda"; - version = "1.5.0"; + version = "2.2.0"; - src = fetchurl { - url = "https://github.com/alda-lang/alda/releases/download/${version}/alda"; - sha256 = "sha256-OHbOsgYN87ThU7EgjCgxADnOv32qIi+7XwDwcW0dmV0="; + src_alda = fetchurl { + url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/client/linux-amd64/alda"; + sha256 = "0z3n81fmv3fxwgr641r6jjn1dmi5d3rw8d6r8jdfjhgpxanyi9a7"; + }; + + src_player = fetchurl { + url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/player/non-windows/alda-player"; + sha256 = "11kji846hbn1f2w1s7rc1ing203jkamy89j1jmysajvirdpp8nha"; }; dontUnpack = true; - installPhase = '' - install -Dm755 $src $out/bin/alda - sed -i -e '1 s!java!${jre}/bin/java!' $out/bin/alda - ''; + nativeBuildInputs = [ makeWrapper ]; + + installPhase = + let + binPath = lib.makeBinPath [ jre ]; + in + '' + install -D $src_alda $out/bin/alda + install -D $src_player $out/bin/alda-player + wrapProgram $out/bin/alda --prefix PATH : $out/bin:${binPath} + wrapProgram $out/bin/alda-player --prefix PATH : $out/bin:${binPath} + ''; meta = with lib; { description = "A music programming language for musicians";