diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2020-10-07 06:57:19 +0200 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2020-10-14 07:33:04 +0200 |
commit | c0ab50b7412b3d480a79130c379fe1a0cb14395d (patch) | |
tree | 08ab29d70bf2b8a74a6c67641fad347ee660009d /pkgs/applications/misc/orpie | |
parent | b3910a583c01a137b6337cb919777386d191b1ac (diff) |
orpie: 1.5.2 → 1.6.1
Diffstat (limited to 'pkgs/applications/misc/orpie')
-rw-r--r-- | pkgs/applications/misc/orpie/default.nix | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix index d869b09395580..2bf102fee257a 100644 --- a/pkgs/applications/misc/orpie/default.nix +++ b/pkgs/applications/misc/orpie/default.nix @@ -1,21 +1,30 @@ -{ stdenv, fetchurl, ocamlPackages, ncurses, gsl }: +{ lib, fetchFromGitHub, ocamlPackages }: -stdenv.mkDerivation rec { +ocamlPackages.buildDunePackage rec { pname = "orpie"; - version = "1.5.2"; + version = "1.6.1"; - src = fetchurl { - url = "http://pessimization.com/software/orpie/${pname}-${version}.tar.gz"; - sha256 = "0v9xgpcf186ni55rkmx008msyszw0ypd6rd98hgwpih8yv3pymfy"; + src = fetchFromGitHub { + owner = "pelzlpj"; + repo = pname; + rev = "release-${version}"; + sha256 = "1rx2nl6cdv609pfymnbq53pi3ql5fr4kda8x10ycd9xq2gc4f21g"; }; - buildInputs = [ ncurses gsl ] ++ (with ocamlPackages; [ ocaml camlp4 ]); + preConfigure = '' + patchShebangs scripts + substituteInPlace scripts/compute_prefix \ + --replace '"topfind"' \ + '"${ocamlPackages.findlib}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/topfind"' + export PREFIX=$out + ''; + + buildInputs = with ocamlPackages; [ curses camlp5 num gsl ]; meta = { - homepage = "https://github.com/pelzlpj/orpie"; - description = "A fullscreen RPN calculator for the console"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ obadz ]; + inherit (src.meta) homepage; + description = "A Curses-based RPN calculator"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ obadz ]; }; } |