mmex: fix aarch64-darwin build (#371231) (8ac76fc5) · Commits · nix / nixpkgs

pkgs/applications/office/mmex/default.nix→pkgs/by-name/mm/mmex/package.nix

+17 −14

Original line number	Diff line number	Diff line
		@@ -15,7 +15,8 @@
		sqlite,
		wxGTK32,
		gtk3,
		darwin,
		lua,
		wxsqlite3,
		}:

		stdenv.mkDerivation rec {
		@@ -39,9 +40,9 @@ stdenv.mkDerivation rec {
		})
		];

		postPatch = lib.optionalString (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isx86_64) ''
		substituteInPlace 3rd/CMakeLists.txt \
		--replace "-msse4.2 -maes" ""
		postPatch = ''
		substituteInPlace src/dbwrapper.cpp src/model/Model_Report.cpp \
		--replace-fail "sqlite3mc_amalgamation.h" "sqlite3.h"
		'';

		nativeBuildInputs =
		@@ -59,19 +60,21 @@ stdenv.mkDerivation rec {
		lsb-release
		];

		buildInputs =
		[
		buildInputs = [
		curl
		sqlite
		wxGTK32
		gtk3
		]
		++ lib.optionals stdenv.hostPlatform.isDarwin [
		darwin.libobjc
		lua
		wxsqlite3
		];

		strictDeps = true;

		cmakeFlags = [
		"-DWXSQLITE3_HAVE_CODEC=1"
		];

		env.NIX_CFLAGS_COMPILE = toString (
		lib.optionals stdenv.cc.isClang [
		"-Wno-deprecated-copy"

+0 −6

Original line number	Diff line number	Diff line
		@@ -14373,12 +14373,6 @@ with pkgs;
		ocamlPackages = ocaml-ng.ocamlPackages_4_14;
		};

		mmex = callPackage ../applications/office/mmex {
		wxGTK32 = wxGTK32.override {
		withWebKit = true;
		};
		};

		mmlgui = callPackage ../applications/audio/mmlgui {
		inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
		libvgm = libvgm.override {