gcompris: migrate to by-name (#425121)

This commit is contained in:
Peder Bergebakken Sundt
2025-07-18 22:59:43 +02:00
committed by GitHub
2 changed files with 6 additions and 16 deletions
@@ -6,16 +6,7 @@
gettext,
gst_all_1,
ninja,
wrapQtAppsHook,
qmlbox2d,
qtbase,
qtcharts,
qtdeclarative,
qtimageformats,
qtmultimedia,
qtsensors,
qttools,
extra-cmake-modules,
kdePackages,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -35,20 +26,21 @@ stdenv.mkDerivation (finalAttrs: {
'';
cmakeFlags = [
(lib.cmakeFeature "QML_BOX2D_LIBRARY" "${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.1")
(lib.cmakeFeature "QML_BOX2D_LIBRARY" "${kdePackages.qmlbox2d}/${kdePackages.qtbase.qtQmlPrefix}/Box2D.2.1")
(lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
];
nativeBuildInputs = [
cmake
extra-cmake-modules
kdePackages.extra-cmake-modules
gettext
ninja
qttools
wrapQtAppsHook
kdePackages.qttools
kdePackages.wrapQtAppsHook
];
buildInputs =
with kdePackages;
[
qmlbox2d
qtbase
-2
View File
@@ -14733,8 +14733,6 @@ with pkgs;
garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };
gcompris = kdePackages.callPackage ../games/gcompris { };
gl-gsync-demo = callPackage ../games/gl-gsync-demo {
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
};