nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 07:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52567 from guibou/gcompris-0.95

Browse Source 
gcompris: 0.91 -> 0.95
This commit is contained in:
Jörg Thalheim 2018-12-20 20:07:41 +01:00 committed by GitHub
commit 1bb56620b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/qmlbox2d/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, qtdeclarative, fetchFromGitHub, qmake }: {stdenv, qtdeclarative, fetchFromGitHub, qmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qml-box2d-2018-03-16"; name = "qml-box2d-2018-04-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qml-box2d"; owner = "qml-box2d";
repo = "qml-box2d"; repo = "qml-box2d";
sha256 = "1fbsvv28b4r0szcv8bk5gxpf8v534jp2axyfp438384sy757wsq2"; sha256 = "0gb8limy6ck23z3k0k2j7c4c4s95p40f6lbzk4szq7fjnnw22kb7";
rev = "21e57f1"; rev = "b7212d5640701f93f0cd88fbd3a32c619030ae62";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/games/gcompris/default.nix
View File

@ -2,12 +2,12 @@
gst_all_1, ninja gst_all_1, ninja
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.91"; version = "0.95";
name = "gcompris-${version}"; name = "gcompris-${version}";
src = fetchurl { src = fetchurl {
url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz"; url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz";
sha256 = "09h098w9q79hnzla1pcpqlnnr6dbafm4q6zmdp7wlk11ym8n9kvg"; sha256 = "1aaijjx2b7k1cyx59jhs64hlp1sppw1faa81qxl5lxc79vifrlrl";
}; };
cmakeFlags = "-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.0"; cmakeFlags = "-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.0";

4
pkgs/top-level/all-packages.nix
View File

@ -12243,7 +12243,7 @@ in
qmltermwidget = callPackage ../development/libraries/qmltermwidget { qmltermwidget = callPackage ../development/libraries/qmltermwidget {
inherit (darwin.apple_sdk.libs) utmp; inherit (darwin.apple_sdk.libs) utmp;
}; };
qmlbox2d = libsForQt59.callPackage ../development/libraries/qmlbox2d { }; qmlbox2d = libsForQt5.callPackage ../development/libraries/qmlbox2d { };
qscintilla = callPackage ../development/libraries/qscintilla { qscintilla = callPackage ../development/libraries/qscintilla {
withQt5 = true; withQt5 = true;
@ -20615,7 +20615,7 @@ in
gcs = callPackage ../games/gcs { }; gcs = callPackage ../games/gcs { };
gcompris = libsForQt59.callPackage ../games/gcompris { }; gcompris = libsForQt5.callPackage ../games/gcompris { };
gemrb = callPackage ../games/gemrb { }; gemrb = callPackage ../games/gemrb { };