diff options
| author | Joe Hermaszewski <git@monoid.al> | 2021-04-30 17:32:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-30 11:32:45 +0200 |
| commit | 849b29b4f76d66ec7aeeeed699b7e27ef3db7c02 (patch) | |
| tree | 447fc7863e976a656eca4feab28bc5a2c8d561b6 /pkgs/development/libraries/pangolin | |
| parent | 71b873942ef95937bed2400141c7fa2e22e406dd (diff) | |
pangolin: 2017-08-02 -> 0.6 (#120735)
Drop ffmpeg_3 dependency in favor of ffmpeg: https://github.com/NixOS/nixpkgs/issues/120705
Diffstat (limited to 'pkgs/development/libraries/pangolin')
| -rw-r--r-- | pkgs/development/libraries/pangolin/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 0e5d705a1ce6e..331284021e3b8 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,18 +1,18 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew -, xorg , ffmpeg_3, python3 , libjpeg, libpng, libtiff, eigen +, 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 pkg-config doxygen ]; @@ -21,8 +21,7 @@ stdenv.mkDerivation { libGL glew xorg.libX11 - ffmpeg_3 - python3 + ffmpeg libjpeg libpng libtiff |