pyrox.dev
Merge pull request #212551 from peterhoeg/u/gcompris_3_1
gcompris: 2.4 -> 3.1
authored by
Weijia Wang
and committed by
GitHub
47e49ff0
e2c95287
+11
-7
pkgs/games/gcompris/default.nix
+11
-7
pkgs/games/gcompris/default.nix
···
1
-
{ mkDerivation
1
+
{ stdenv
2
2
, cmake
3
3
, fetchurl
4
4
, gettext
5
5
, gst_all_1
6
6
, lib
7
7
, ninja
8
+
, wrapQtAppsHook
8
9
, qmlbox2d
9
10
, qtbase
11
+
, qtcharts
10
12
, qtdeclarative
11
13
, qtgraphicaleffects
12
14
, qtmultimedia
13
-
, qtquickcontrols
15
+
, qtquickcontrols2
14
16
, qtsensors
15
17
, qttools
16
18
, qtxmlpatterns
17
19
}:
18
20
19
-
mkDerivation rec {
21
+
stdenv.mkDerivation rec {
20
22
pname = "gcompris";
21
-
version = "2.4";
23
+
version = "3.1";
22
24
23
25
src = fetchurl {
24
26
url = "https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-${version}.tar.xz";
25
-
sha256 = "sha256-/QZub48rarVHcD0PgOPc6NTlOKrsEzVK/qjHb5CjWS0=";
27
+
hash = "sha256-wABGojMfiMgjUT5gVDfB5JmXK1SPkrIkqLT/403zUFI=";
26
28
};
27
29
28
30
cmakeFlags = [
29
31
"-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.1"
30
32
];
31
33
32
-
nativeBuildInputs = [ cmake gettext ninja qttools ];
34
+
nativeBuildInputs = [ cmake gettext ninja qttools wrapQtAppsHook ];
33
35
34
36
buildInputs = [
35
37
qmlbox2d
38
+
qtbase
39
+
qtcharts
36
40
qtdeclarative
37
41
qtgraphicaleffects
38
42
qtmultimedia
39
-
qtquickcontrols
43
+
qtquickcontrols2
40
44
qtsensors
41
45
qtxmlpatterns
42
46
] ++ (with gst_all_1; [