pangolin: Use libtiff.out as buildInput, finalAttrs and cmakeBool (#393990)
This commit is contained in:
@@ -17,14 +17,14 @@
|
||||
Cocoa,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pangolin";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevenlovegrove";
|
||||
repo = "Pangolin";
|
||||
rev = "v${version}";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-B5YuNcJZHjR3dlVs66rySi68j29O3iMtlQvCjTUZBeY=";
|
||||
};
|
||||
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
ffmpeg
|
||||
libjpeg
|
||||
libpng
|
||||
libtiff
|
||||
libtiff.out
|
||||
eigen
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
# The tests use cmake's findPackage to find the installed version of
|
||||
# pangolin, which isn't what we want (or available).
|
||||
doCheck = false;
|
||||
cmakeFlags = [ "-DBUILD_TESTS=OFF" ];
|
||||
cmakeFlags = [ (lib.cmakeBool "BUILD_TESTS" false) ];
|
||||
|
||||
meta = {
|
||||
description = "Lightweight portable rapid development library for managing OpenGL display / interaction and abstracting video input";
|
||||
@@ -72,4 +72,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user