Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 33b67761be99
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bde1c6b5e85b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 29, 2019

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lukekarrys Luke Karrys
    Copy the full SHA
    8d3c2c8 View commit details
  2. Merge pull request #67604 from peterhoeg/f/gcompris

    gcompris: use Qt mkDerivation
    worldofpeace authored Aug 29, 2019
    Copy the full SHA
    bde1c6b View commit details
Showing with 37 additions and 19 deletions.
  1. +37 −19 pkgs/games/gcompris/default.nix
56 changes: 37 additions & 19 deletions pkgs/games/gcompris/default.nix
Original file line number Diff line number Diff line change
@@ -1,37 +1,55 @@
{stdenv, cmake, qtbase, fetchurl, qtdeclarative, qtmultimedia, qttools, qtsensors, qmlbox2d, gettext, qtquickcontrols, qtgraphicaleffects, qtxmlpatterns, makeWrapper,
gst_all_1, ninja
{ mkDerivation
, cmake
, fetchurl
, gettext
, gst_all_1
, lib
, ninja
, qmlbox2d
, qtbase
, qtdeclarative
, qtgraphicaleffects
, qtmultimedia
, qtquickcontrols
, qtsensors
, qttools
, qtxmlpatterns
}:
stdenv.mkDerivation rec {

mkDerivation rec {
pname = "gcompris";
version = "0.96";
name = "gcompris-${version}";

src = fetchurl {
url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz";
sha256 = "06483il59l46ny2w771sg45dgzjwv1ph7vidzzbj0wb8wbk2rg52";
};

cmakeFlags = "-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.0";
cmakeFlags = [
"-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.0"
];

nativeBuildInputs = [ cmake gettext ninja qttools ];

nativeBuildInputs = [ cmake ninja makeWrapper ];
buildInputs = [ qtbase qtdeclarative qttools qtsensors qmlbox2d gettext qtquickcontrols qtmultimedia qtgraphicaleffects qtxmlpatterns] ++ soundPlugins;
soundPlugins = with gst_all_1; [gst-plugins-good gstreamer gst-plugins-base gst-plugins-bad];
buildInputs = [
qmlbox2d qtbase qtdeclarative qtgraphicaleffects qtmultimedia qtquickcontrols qtsensors qtxmlpatterns
] ++ (with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
]);

postInstall = ''
# install .desktop and icon file
mkdir -p $out/share/applications/
mkdir -p $out/share/icons/hicolor/256x256/apps/
cp ../org.kde.gcompris.desktop $out/share/applications/gcompris.desktop
cp -r ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png
install -Dm444 ../org.kde.gcompris.desktop $out/share/applications/gcompris.desktop
install -Dm444 ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png
install -Dm444 ../org.kde.gcompris.appdata.xml -t $out/share/metainfo
wrapProgram "$out/bin/gcompris-qt" \
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
'';
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
'';

meta = with stdenv.lib; {
meta = with lib; {
description = "A high quality educational software suite, including a large number of activities for children aged 2 to 10";
homepage = "https://gcompris.net/";
maintainers = [ maintainers.guibou ];
platforms = [ "i686-linux" "x86_64-linux" ];
license = licenses.gpl3Plus;
maintainers = with maintainers; [ guibou ];
platforms = platforms.linux;
};
}