public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pangolin: 2017-08-02 -> 0.6 (#120735) 

Drop ffmpeg_3 dependency in favor of ffmpeg: https://github.com/NixOS/nixpkgs/issues/120705
This commit is contained in:
Joe Hermaszewski 2021-04-30 17:32:45 +08:00 committed by GitHub
parent 71b873942e
commit 849b29b4f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/pangolin/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew { 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 , Carbon ? null, Cocoa ? null
}: }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "pangolin"; pname = "pangolin";
version = "2017-08-02"; version = "0.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stevenlovegrove"; owner = "stevenlovegrove";
repo = "Pangolin"; repo = "Pangolin";
rev = "f05a8cdc4f0e32cc1664a430f1f85e60e233c407"; rev = "v${version}";
sha256 = "0pfbaarlsw7f7cmsppm7m13nz0k530wwwyczy2l9k448p3v7x9j0"; sha256 = "0abjajxj7lc2yajshimar4w8kf8115prsjnhy83s6jc7cbz63wj8";
}; };
nativeBuildInputs = [ cmake pkg-config doxygen ]; nativeBuildInputs = [ cmake pkg-config doxygen ];
@ -21,8 +21,7 @@ stdenv.mkDerivation {
libGL libGL
glew glew
xorg.libX11 xorg.libX11
ffmpeg_3 ffmpeg
python3
libjpeg libjpeg
libpng libpng
libtiff libtiff