diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:57:58 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:58:19 +0100 |
commit | 09af15654f0c8091f1b9e0bbb2e523cdee194442 (patch) | |
tree | e648edef1ce4c64c533f2593aa22b8015cf0e506 /pkgs/applications/science/math | |
parent | f306e67e15bdbe9a8358c9f81319fc4fcbadc2eb (diff) | |
parent | 0ee75214f336474e127c2e3546c0406a0c4d5fa7 (diff) |
Merge master into closure-size
The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
Diffstat (limited to 'pkgs/applications/science/math')
-rw-r--r-- | pkgs/applications/science/math/calc/default.nix | 45 | ||||
-rw-r--r-- | pkgs/applications/science/math/lp_solve/default.nix | 2 |
2 files changed, 46 insertions, 1 deletions
diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix new file mode 100644 index 0000000000000..8673d7debd9de --- /dev/null +++ b/pkgs/applications/science/math/calc/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, makeWrapper, glibc, readline, ncurses, groff, utillinux }: + +with stdenv.lib; +let + makeFlags = '' + INCDIR=${glibc}/include \ + BINDIR=$out/bin LIBDIR=$out/lib CALC_INCDIR=$out/include/calc CALC_SHAREDIR=$out/share/calc MANDIR=$out/share/man/man1 \ + USE_READLINE=-DUSE_READLINE READLINE_LIB=-lreadline READLINE_EXTRAS='-lhistory -lncurses' \ + TERMCONTROL=-DUSE_TERMIOS \ + NROFF=groff + ''; +in +stdenv.mkDerivation rec { + + name = "calc-${version}"; + version = "2.12.5.3"; + + src = fetchurl { + url = "mirror://sourceforge/calc/${name}.tar.bz2"; + sha256 = "14mnz6smhi3a0rgmwvddk9w3vdisi8khq67i8nqsl47vgs8n1kqg"; + }; + + buildInputs = [ makeWrapper readline ncurses groff utillinux ]; + + configurePhase = '' + sed -i 's/all: check_include/all:/' Makefile + ''; + + buildPhase = '' + make ${makeFlags} + ''; + + installPhase = '' + make install ${makeFlags} + wrapProgram $out/bin/calc --prefix LD_LIBRARY_PATH : $out/lib + ''; + + meta = { + description = "C-style arbitrary precision calculator"; + homepage = http://www.isthe.com/chongo/tech/comp/calc/; + license = licenses.lgpl21; + maintainers = [ ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index 09af2d708c965..7726793fcaf83 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/applications/science/math/lp_solve/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "lp_solve is a Mixed Integer Linear Programming (MILP) solver."; + description = "lp_solve is a Mixed Integer Linear Programming (MILP) solver"; homepage = "http://lpsolve.sourceforge.net"; license = licenses.gpl2Plus; maintainers = with maintainers; [ smironov ]; |