From 45170fdb53589871f3e4a13f0080c61113b15580 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 2 Jul 2023 15:17:14 -0700 Subject: [PATCH] lib3mf: fix building tests on aarch64-darwin --- pkgs/development/libraries/lib3mf/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lib3mf/default.nix b/pkgs/development/libraries/lib3mf/default.nix index 56af0278597..0da54cd61c0 100644 --- a/pkgs/development/libraries/lib3mf/default.nix +++ b/pkgs/development/libraries/lib3mf/default.nix @@ -29,10 +29,13 @@ stdenv.mkDerivation rec { ] ++ (if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ]); postPatch = '' + # This lets us build the tests properly on aarch64-darwin. + substituteInPlace CMakeLists.txt \ + --replace 'SET(CMAKE_OSX_ARCHITECTURES "x86_64")' "" + # fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ sed -i 's,libdir=''${\(exec_\)\?prefix}/,libdir=,' lib3mf.pc.in - # replace bundled binaries for i in AutomaticComponentToolkit/bin/act.*; do ln -sf ${automaticcomponenttoolkit}/bin/act $i