From 6e3645cb5bda01c868f66c914764b9abd2f40f6c Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 17 Sep 2025 15:02:01 +0100 Subject: [PATCH 1/2] libsForQt5.qmlbox2d: drop Has a Qt 6 version, and the Qt 5 version is unused in tree. --- pkgs/top-level/qt5-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index d65f6c3da347..c10a087dc7ee 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -171,8 +171,6 @@ makeScopeWithSplicing' { qmltermwidget = callPackage ../development/libraries/qmltermwidget { }; - qmlbox2d = callPackage ../development/libraries/qmlbox2d { }; - qoauth = callPackage ../development/libraries/qoauth { }; qt5ct = callPackage ../tools/misc/qt5ct { }; From 72c53ae24791e37bf9b237185baa080a4c0d38cd Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 17 Sep 2025 15:02:01 +0100 Subject: [PATCH 2/2] kdePackages.qmlbox2d: revendor Box2D MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They require an older version than our main `box2d_2` package (which itself is only used for LibreOffice). Our package works fine with CMake 4, as does the CMake build system they use in their vendored version, but the upstream release of the old version does not. Since this is a somewhat pointless single‐package use of `overrideAttrs`, just let it handle the Box2D build itself. --- .../libraries/qmlbox2d/default.nix | 29 ------------------- 1 file changed, 29 deletions(-) diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix index 3a1552d6596a..2a8ca5de0c37 100644 --- a/pkgs/development/libraries/qmlbox2d/default.nix +++ b/pkgs/development/libraries/qmlbox2d/default.nix @@ -6,33 +6,9 @@ fetchFromGitHub, cmake, pkg-config, - box2d, unstableGitUpdater, }: -let - inherit (lib) cmakeBool; - - # 2.3.1 is the only supported version - box2d' = box2d.overrideAttrs (old: rec { - version = "2.3.1"; - src = fetchFromGitHub { - owner = "erincatto"; - repo = "box2d"; - tag = "v${version}"; - hash = "sha256-Z2J17YMzQNZqABIa5eyJDT7BWfXveymzs+DWsrklPIs="; - }; - patches = [ ]; - postPatch = ""; - sourceRoot = "${src.name}/Box2D"; - cmakeFlags = old.cmakeFlags or [ ] ++ [ - (cmakeBool "BOX2D_INSTALL" true) - (cmakeBool "BOX2D_BUILD_SHARED" true) - (cmakeBool "BOX2D_BUILD_EXAMPLES" false) - ]; - }); - -in stdenv.mkDerivation { pname = "qml-box2d"; version = "0-unstable-2024-04-15"; @@ -52,15 +28,10 @@ stdenv.mkDerivation { ]; buildInputs = [ - box2d' qtbase qtdeclarative ]; - cmakeFlags = [ - (cmakeBool "USE_SYSTEM_BOX2D" true) - ]; - passthru = { updateScript = unstableGitUpdater { hardcodeZeroVersion = true;