From 2bfeb89021c53d15c52148a986fa607fade86bb6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 5 Jan 2025 20:39:34 +0100 Subject: [PATCH 1/2] mmex: move to pkgs/by-name --- .../office/mmex/default.nix => by-name/mm/mmex/package.nix} | 0 pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 6 deletions(-) rename pkgs/{applications/office/mmex/default.nix => by-name/mm/mmex/package.nix} (100%) diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/by-name/mm/mmex/package.nix similarity index 100% rename from pkgs/applications/office/mmex/default.nix rename to pkgs/by-name/mm/mmex/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27be71eb53c4..fde97707851a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14470,12 +14470,6 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string; }; - 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 { From 405a6a53c511b6798af9dc61ad0bf2303b26000e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 6 Jan 2025 19:19:16 +0100 Subject: [PATCH 2/2] mmex: unvendor --- pkgs/by-name/mm/mmex/package.nix | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/mm/mmex/package.nix b/pkgs/by-name/mm/mmex/package.nix index c45500832f64..a5eb63ddc001 100644 --- a/pkgs/by-name/mm/mmex/package.nix +++ b/pkgs/by-name/mm/mmex/package.nix @@ -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 = - [ - curl - sqlite - wxGTK32 - gtk3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libobjc - ]; + buildInputs = [ + curl + sqlite + wxGTK32 + gtk3 + lua + wxsqlite3 + ]; strictDeps = true; + cmakeFlags = [ + "-DWXSQLITE3_HAVE_CODEC=1" + ]; + env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.cc.isClang [ "-Wno-deprecated-copy"