summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Mahut <marek.mahut@gmail.com>2019-08-13 11:07:27 +0200
committerMatthieu Coudron <coudron@iij.ad.jp>2019-08-14 15:16:22 +0900
commit8fa1bb84e869d17a8dbb9bb5b24ea49843a57faf (patch)
treeb7b5fcc8b3e1bad5ee1ea6fde88f3c5882c6ffa8
parentcf5f02b4bb52d3df1d1d8a4875155d4f077e8f56 (diff)
ptex: 2.3.0 -> 2.3.2
-rw-r--r--pkgs/development/libraries/ptex/default.nix27
1 files changed, 9 insertions, 18 deletions
diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix
index aa17771ec9f2..b4571d07fbf3 100644
--- a/pkgs/development/libraries/ptex/default.nix
+++ b/pkgs/development/libraries/ptex/default.nix
@@ -1,36 +1,27 @@
-{ stdenv, fetchFromGitHub, zlib, python, cmake }:
+{ stdenv, fetchFromGitHub, zlib, python, cmake, pkg-config }:
stdenv.mkDerivation rec
{
- name = "ptex-${version}";
- version = "2.3.0";
+ pname = "ptex";
+ version = "2.3.2";
src = fetchFromGitHub {
owner = "wdas";
repo = "ptex";
rev = "v${version}";
- sha256 = "0nfz0y66bmi6xckn1whi4sfd8i3ibln212fgm4img2z98b6vccyg";
+ sha256 = "1c3pdqszn4y3d86qzng8b0hqdrchnl39adq5ab30wfnrgl2hnm4z";
};
outputs = [ "bin" "dev" "out" "lib" ];
- buildInputs = [ zlib python cmake ];
+ buildInputs = [ zlib python cmake pkg-config ];
enableParallelBuilding = true;
- buildPhase = ''
- mkdir -p $out
-
- make prefix=$out
-
- mkdir -p $bin/bin
- mkdir -p $dev/include
- mkdir -p $lib/lib
- '';
-
- installPhase = ''
- make install
- mv $out/bin $bin/
+ # Can be removed in the next release
+ # https://github.com/wdas/ptex/pull/42
+ patchPhase = ''
+ echo v${version} >version
'';
meta = with stdenv.lib; {