gcompris: migrate to by-name

gcompris: add with kdePackages

gcompris: treefmt

+6 -16
+6 -14
pkgs/games/gcompris/default.nix pkgs/by-name/gc/gcompris/package.nix
··· 6 6 gettext, 7 7 gst_all_1, 8 8 ninja, 9 - wrapQtAppsHook, 10 - qmlbox2d, 11 - qtbase, 12 - qtcharts, 13 - qtdeclarative, 14 - qtimageformats, 15 - qtmultimedia, 16 - qtsensors, 17 - qttools, 18 - extra-cmake-modules, 9 + kdePackages, 19 10 }: 20 11 21 12 stdenv.mkDerivation (finalAttrs: { ··· 35 26 ''; 36 27 37 28 cmakeFlags = [ 38 - (lib.cmakeFeature "QML_BOX2D_LIBRARY" "${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.1") 29 + (lib.cmakeFeature "QML_BOX2D_LIBRARY" "${kdePackages.qmlbox2d}/${kdePackages.qtbase.qtQmlPrefix}/Box2D.2.1") 39 30 (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) 40 31 ]; 41 32 42 33 nativeBuildInputs = [ 43 34 cmake 44 - extra-cmake-modules 35 + kdePackages.extra-cmake-modules 45 36 gettext 46 37 ninja 47 - qttools 48 - wrapQtAppsHook 38 + kdePackages.qttools 39 + kdePackages.wrapQtAppsHook 49 40 ]; 50 41 51 42 buildInputs = 43 + with kdePackages; 52 44 [ 53 45 qmlbox2d 54 46 qtbase
-2
pkgs/top-level/all-packages.nix
··· 14785 14785 14786 14786 garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; }; 14787 14787 14788 - gcompris = kdePackages.callPackage ../games/gcompris { }; 14789 - 14790 14788 gl-gsync-demo = callPackage ../games/gl-gsync-demo { 14791 14789 libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; 14792 14790 };