Unverified Commit 2612aaeb authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

gcompris: migrate to by-name (#425121)

parents 94ba2bf0 de8cd44b

pkgs/games/gcompris/default.nix→pkgs/by-name/gc/gcompris/package.nix

+6 −14
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -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;

  };