From 5d82bbf23921bbe10927d1d93b96cc96fc505ada Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Fri, 2 May 2025 10:16:16 +0800 Subject: [PATCH 1/3] opencolorio_1: unbreak on clang --- pkgs/development/libraries/opencolorio/1.x.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix index 4ac41482037f..ba12a82ffaa7 100644 --- a/pkgs/development/libraries/opencolorio/1.x.nix +++ b/pkgs/development/libraries/opencolorio/1.x.nix @@ -57,6 +57,13 @@ stdenv.mkDerivation rec { stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 ) "-DCMAKE_OSX_ARCHITECTURES=arm64"; + env = lib.optionalAttrs stdenv.cc.isClang { + # yaml-cpp uses std::auto_ptr and std::binary_function which has + # been disabled in clang with libcxx. These flags re-enables these + # features + NIX_CXXSTDLIB_COMPILE = "-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR=1 -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION=1"; + }; + postInstall = '' moveToOutput bin "$bin" moveToOutput cmake "$dev" From f1d239c8859a4cf45ce549e88c4301977adc44a5 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Sat, 3 May 2025 19:57:36 +0800 Subject: [PATCH 2/3] opencolorio_1: modernize, add maintainer --- .../development/libraries/opencolorio/1.x.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix index ba12a82ffaa7..e910b77decae 100644 --- a/pkgs/development/libraries/opencolorio/1.x.nix +++ b/pkgs/development/libraries/opencolorio/1.x.nix @@ -3,22 +3,22 @@ lib, fetchFromGitHub, cmake, - boost, + git, pkg-config, lcms2, tinyxml, - git, + boost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAtts: { pname = "opencolorio"; version = "1.1.1"; src = fetchFromGitHub { owner = "imageworks"; repo = "OpenColorIO"; - rev = "v${version}"; - sha256 = "12srvxca51czpfjl0gabpidj9n84mw78ivxy5w75qhq2mmc798sb"; + tag = "v${finalAtts.version}"; + hash = "sha256-S6N0WK0CQ1wOL77viA6vBNkkW7xLPUClu5+FoljfWYs="; }; outputs = [ @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { # TODO: Investigate whether git can be dropped: It's only used to apply patches nativeBuildInputs = [ cmake - pkg-config git + pkg-config ]; buildInputs = [ @@ -73,11 +73,11 @@ stdenv.mkDerivation rec { --replace "$out/bin" "$bin/bin" ''; - meta = with lib; { + meta = { homepage = "https://opencolorio.org"; description = "Color management framework for visual effects and animation"; - license = licenses.bsd3; - maintainers = [ ]; - platforms = platforms.unix; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ yzx9 ]; + platforms = lib.platforms.unix; }; -} +}) From f92c8fa9dcbac039cb3ba2e39401de82b5bf900e Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Sat, 3 May 2025 19:58:12 +0800 Subject: [PATCH 3/3] opencolorio_1: use gitMinimal --- pkgs/development/libraries/opencolorio/1.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix index e910b77decae..c91fee14ed23 100644 --- a/pkgs/development/libraries/opencolorio/1.x.nix +++ b/pkgs/development/libraries/opencolorio/1.x.nix @@ -3,7 +3,7 @@ lib, fetchFromGitHub, cmake, - git, + gitMinimal, pkg-config, lcms2, tinyxml, @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAtts: { # TODO: Investigate whether git can be dropped: It's only used to apply patches nativeBuildInputs = [ cmake - git + gitMinimal pkg-config ];