summary refs log tree commit diff
path: root/pkgs/applications/science
diff options
context:
space:
mode:
authorPascal Wittmann <PascalWittmann@gmx.net>2016-01-17 20:00:16 +0100
committerPascal Wittmann <PascalWittmann@gmx.net>2016-01-17 20:00:16 +0100
commitff837f92880721f1ef5ca71fbe65ad8d61cd12bc (patch)
tree9915b6d6d9c40e3d39fca291c4b4c196fd208907 /pkgs/applications/science
parenta04a7272aa38ada45e694281071b720d4abbd0df (diff)
parent8a26d9b84f566b5ead7744f425f4e5f41865a060 (diff)
downloadnixlib-ff837f92880721f1ef5ca71fbe65ad8d61cd12bc.tar
nixlib-ff837f92880721f1ef5ca71fbe65ad8d61cd12bc.tar.gz
nixlib-ff837f92880721f1ef5ca71fbe65ad8d61cd12bc.tar.bz2
nixlib-ff837f92880721f1ef5ca71fbe65ad8d61cd12bc.tar.lz
nixlib-ff837f92880721f1ef5ca71fbe65ad8d61cd12bc.tar.xz
nixlib-ff837f92880721f1ef5ca71fbe65ad8d61cd12bc.tar.zst
nixlib-ff837f92880721f1ef5ca71fbe65ad8d61cd12bc.zip
Merge pull request #12443 from gebner/lean-ninja
lean: update and add wrapper for linja
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r--pkgs/applications/science/logic/lean/default.nix14
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index 5a4e2cbbc055..92c306c40827 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchFromGitHub, cmake, gmp, mpfr, luajit, boost, python
-, gperftools, ninja }:
+, gperftools, ninja, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "lean-${version}";
-  version = "20150821";
+  version = "20160117";
 
   src = fetchFromGitHub {
     owner  = "leanprover";
     repo   = "lean";
-    rev    = "453bd2341dac51e50d9bff07d5ff6c9c3fb3ba0b";
-    sha256 = "1hmga5my123sra873iyqc7drj4skny4hnhsasaxjkmmdhmj1zpka";
+    rev    = "b2554dcb8f45899ccce84f226cd67b6460442930";
+    sha256 = "1gr024bly92kdjky5qvcm96gn86ijakziiyrsz91h643n1iyxhms";
   };
 
-  buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja ];
+  buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja makeWrapper ];
   enableParallelBuilding = true;
 
   preConfigure = ''
@@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
 
+  postInstall = ''
+    wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin
+  '';
+
   meta = {
     description = "Automatic and interactive theorem prover";
     homepage    = "http://leanprover.github.io";