pyrox.dev
pangolin: 2017-08-02 -> 0.6 (#120735)
Drop ffmpeg_3 dependency in favor of ffmpeg: https://github.com/NixOS/nixpkgs/issues/120705
authored by Joe Hermaszewski and committed by GitHub 849b29b4 71b87394
+6
-7
pkgs/development/libraries/pangolin/default.nix
+6
-7
pkgs/development/libraries/pangolin/default.nix
···
1
1
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew
2
-
, xorg , ffmpeg_3, python3 , libjpeg, libpng, libtiff, eigen
2
+
, xorg, ffmpeg, libjpeg, libpng, libtiff, eigen
3
3
, Carbon ? null, Cocoa ? null
4
4
}:
5
5
6
-
stdenv.mkDerivation {
6
+
stdenv.mkDerivation rec {
7
7
pname = "pangolin";
8
8
9
-
version = "2017-08-02";
9
+
version = "0.6";
10
10
11
11
src = fetchFromGitHub {
12
12
owner = "stevenlovegrove";
13
13
repo = "Pangolin";
14
-
rev = "f05a8cdc4f0e32cc1664a430f1f85e60e233c407";
15
-
sha256 = "0pfbaarlsw7f7cmsppm7m13nz0k530wwwyczy2l9k448p3v7x9j0";
14
+
rev = "v${version}";
15
+
sha256 = "0abjajxj7lc2yajshimar4w8kf8115prsjnhy83s6jc7cbz63wj8";
16
16
};
17
17
18
18
nativeBuildInputs = [ cmake pkg-config doxygen ];
···
21
21
libGL
22
22
glew
23
23
xorg.libX11
24
-
ffmpeg_3
25
-
python3
24
+
ffmpeg
26
25
libjpeg
27
26
libpng
28
27
libtiff