diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-22 13:47:37 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-22 18:22:22 +0000 |
| commit | 1b9a13c4689af7e088eb7af5589f8c811282846a (patch) | |
| tree | 3ed032953008280fb94ef894c869ff3e2a2f7865 /nixpkgs/pkgs/development/libraries/ptex/default.nix | |
| parent | 4999a38db7c5de0ea9f514a12ecd4133cce647f3 (diff) | |
| parent | 1412af4b2cfae71d447164097d960d426e9752c0 (diff) | |
| download | nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.gz nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.bz2 nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.lz nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.xz nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.zst nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.zip | |
Merge remote-tracking branch 'channels/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/ptex/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/ptex/default.nix | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/nixpkgs/pkgs/development/libraries/ptex/default.nix b/nixpkgs/pkgs/development/libraries/ptex/default.nix index aa17771ec9f2..b4571d07fbf3 100644 --- a/nixpkgs/pkgs/development/libraries/ptex/default.nix +++ b/nixpkgs/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; { |