public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

solarus,solarus-quest-editor: migrate to Qt5.15

Browse Source
This commit is contained in:
freezeboy 2020-12-12 13:47:37 +01:00
parent 16ec307c21
commit 7aaadab55c
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/tools/solarus-quest-editor/default.nix
View File

@ -1,7 +1,7 @@
{ lib, mkDerivation, fetchFromGitLab, cmake, luajit, { lib, mkDerivation, fetchFromGitLab, cmake, luajit
SDL2, SDL2_image, SDL2_ttf, physfs, , SDL2, SDL2_image, SDL2_ttf, physfs, fetchpatch
openal, libmodplug, libvorbis, solarus, , openal, libmodplug, libvorbis, solarus
qtbase, qttools, glm }: , qtbase, qttools, glm }:
mkDerivation rec { mkDerivation rec {
pname = "solarus-quest-editor"; pname = "solarus-quest-editor";
@ -13,7 +13,14 @@ mkDerivation rec {
rev = "v${version}"; rev = "v${version}";
sha256 = "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn"; sha256 = "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn";
}; };
patches = [
(fetchpatch {
url = "https://gitlab.com/solarus-games/solarus-quest-editor/-/commit/81d5c7f1602cf355684d70a5e3449fefccfc44b8.patch";
sha256 = "tVUxkkDp2PcOHGy4dGvUcYj9gF7k4LN21VuxohCw9NE=";
})
];
buildInputs = [ cmake luajit SDL2 buildInputs = [ cmake luajit SDL2
SDL2_image SDL2_ttf physfs SDL2_image SDL2_ttf physfs
openal libmodplug libvorbis openal libmodplug libvorbis
@ -31,5 +38,5 @@ mkDerivation rec {
maintainers = [ maintainers.Nate-Devv ]; maintainers = [ maintainers.Nate-Devv ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

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

@ -26436,8 +26436,8 @@ in
}; };
# solarus and solarus-quest-editor must use the same version of Qt. # solarus and solarus-quest-editor must use the same version of Qt.
solarus = libsForQt514.callPackage ../games/solarus { }; solarus = libsForQt5.callPackage ../games/solarus { };
solarus-quest-editor = libsForQt514.callPackage ../development/tools/solarus-quest-editor { }; solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { };
# You still can override by passing more arguments. # You still can override by passing more arguments.
space-orbit = callPackage ../games/space-orbit { }; space-orbit = callPackage ../games/space-orbit { };