diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
| commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
| tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/interpreters/alda/default.nix | |
| parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
| parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
| download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip | |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/interpreters/alda/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/interpreters/alda/default.nix | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/interpreters/alda/default.nix b/nixpkgs/pkgs/development/interpreters/alda/default.nix index 96d4207dbe8f..ec46a5e3923d 100644 --- a/nixpkgs/pkgs/development/interpreters/alda/default.nix +++ b/nixpkgs/pkgs/development/interpreters/alda/default.nix @@ -1,20 +1,34 @@ -{ lib, stdenv, fetchurl, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { pname = "alda"; - version = "1.5.0"; + version = "2.0.6"; - 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 = "1078hywl3gim5wfgxb0xwbk1dn80ls3i7y33n76qsdd4b0x0sn7i"; + }; + + src_player = fetchurl { + url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/player/non-windows/alda-player"; + sha256 = "1g7k2qnh4vcw63604z7zbvhbpn7l1v3m9mx4j4vywfq6qar1r6ck"; }; 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"; @@ -23,5 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.ericdallo ]; platforms = jre.meta.platforms; }; - } |