From 7b7f0508e83f07fd48d07796585cc7d16489f961 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Thu, 27 Mar 2025 08:53:49 +0100 Subject: [PATCH] pangolin: Use libtiff.out as buildInput, finalAttrs and cmakeBool --- pkgs/development/libraries/pangolin/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index c53c31e32c1e..bb9116110454 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -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; }; -} +})