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