diff options
Diffstat (limited to 'pkgs/development/libraries/pangolin')
-rw-r--r-- | pkgs/development/libraries/pangolin/default.nix | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 3af1833fe49..331284021e3 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,37 +1,34 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, libGL, glew -, xorg , ffmpeg_3, python3 , libjpeg, libpng, libtiff, eigen +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew +, xorg, ffmpeg, libjpeg, libpng, libtiff, eigen , Carbon ? null, Cocoa ? null }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "pangolin"; - version = "2017-08-02"; + version = "0.6"; src = fetchFromGitHub { owner = "stevenlovegrove"; repo = "Pangolin"; - rev = "f05a8cdc4f0e32cc1664a430f1f85e60e233c407"; - sha256 = "0pfbaarlsw7f7cmsppm7m13nz0k530wwwyczy2l9k448p3v7x9j0"; + rev = "v${version}"; + sha256 = "0abjajxj7lc2yajshimar4w8kf8115prsjnhy83s6jc7cbz63wj8"; }; - nativeBuildInputs = [ cmake pkgconfig doxygen ]; - - buildInputs = [ - libGL - glew - xorg.libX11 - ffmpeg_3 - python3 - libjpeg - libpng - libtiff - eigen + nativeBuildInputs = [ cmake pkg-config doxygen ]; + + buildInputs = [ + libGL + glew + xorg.libX11 + ffmpeg + libjpeg + libpng + libtiff + eigen ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; - enableParallelBuilding = true; - # The tests use cmake's findPackage to find the installed version of # pangolin, which isn't what we want (or available). doCheck = false; @@ -50,8 +47,8 @@ stdenv.mkDerivation { graphical data. ''; homepage = "https://github.com/stevenlovegrove/Pangolin"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.expipiplus1 ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.expipiplus1 ]; + platforms = lib.platforms.all; }; } |