From e6bcd21f1f792390ed20c73c296cb1f8b0116e44 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sat, 29 Mar 2025 08:23:29 -0400 Subject: [PATCH] opencollada: formatting Alphabetize params, reorder attrs to be more idiomatic, adjust spacing. --- pkgs/by-name/op/opencollada/package.nix | 38 ++++++++++++------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/op/opencollada/package.nix b/pkgs/by-name/op/opencollada/package.nix index 2e12e13f56c4..274c258ca85c 100644 --- a/pkgs/by-name/op/opencollada/package.nix +++ b/pkgs/by-name/op/opencollada/package.nix @@ -1,18 +1,17 @@ { - lib, - stdenv, + cmake, + darwin, fetchFromGitHub, fetchurl, - cmake, - pkg-config, + lib, libxml2, pcre, - darwin, + pkg-config, + stdenv, }: stdenv.mkDerivation rec { pname = "opencollada"; - version = "1.6.68"; src = fetchFromGitHub { @@ -32,19 +31,6 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ - cmake - pkg-config - ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; [ AGL ] - ); - - propagatedBuildInputs = [ - libxml2 - pcre - ]; - postPatch = '' # Drop blanket -Werror as it tends to fail on newer toolchain for @@ -56,6 +42,20 @@ stdenv.mkDerivation rec { --replace math.h cmath ''; + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; [ AGL ] + ); + + propagatedBuildInputs = [ + libxml2 + pcre + ]; + meta = { description = "Library for handling the COLLADA file format"; homepage = "https://github.com/KhronosGroup/OpenCOLLADA/";