diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-02 13:20:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 13:20:56 +0000 |
| commit | a71eec4269298dd5943642f6a8fae4549b52bd27 (patch) | |
| tree | 1f3abb27a20929fd29900aa92199b36d43e06f96 /pkgs/development/interpreters | |
| parent | 579dcb4845c52e9a8d1a370073f88d10ed65edfa (diff) | |
| parent | ad11ff123a78798a5ea1342f319c34b01995037c (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/icon-lang/default.nix | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index 8190dc0f29f4..02992e718718 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -1,32 +1,41 @@ -{ stdenv, fetchFromGitHub -, libX11, libXt +{ stdenv +, fetchFromGitHub +, libX11 +, libXt , withGraphics ? true }: stdenv.mkDerivation rec { pname = "icon-lang"; - version = "9.5.20i"; - + version = "unstable-2020-02-05"; src = fetchFromGitHub { owner = "gtownsend"; repo = "icon"; - rev = "v${version}"; - sha256 = "0072b3jk8mc94w818z8bklhjdf9rf0d9a7lkvw40pz3niy7zv84s"; + rev = "829cff33de4a21546fb269de3ef5acd7b4f0c0c7"; + sha256 = "1lj2f13pbaajcy4v3744bz46rghhw5sv4dwwfnzhsllbj5gnjsv2"; }; buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ]; - configurePhase = let - target = if withGraphics then "X-Configure" else "Configure"; - platform = if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "macintosh" - else if stdenv.isBSD then "bsd" - else if stdenv.isCygwin then "cygwin" - else if stdenv.isSunOS then "solaris" - else throw "unsupported system"; - in "make ${target} name=${platform}"; + configurePhase = + let + target = if withGraphics then "X-Configure" else "Configure"; + platform = + if stdenv.isLinux then "linux" + else if stdenv.isDarwin then "macintosh" + else if stdenv.isBSD then "bsd" + else if stdenv.isCygwin then "cygwin" + else if stdenv.isSunOS then "solaris" + else throw "unsupported system"; + in + "make ${target} name=${platform}"; - installPhase = "make Install dest=$out"; + installPhase = '' + make Install dest=$out + rm $out/README + mkdir -p $out/share/doc + mv $out/doc $out/share/doc/icon + ''; meta = with stdenv.lib; { description = ''A very high level general-purpose programming language''; |