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

Merge branch 'master' into staging-next

Browse Source 
https://github.com/NixOS/nixpkgs/commit/b04fc593e7b55fe1f74421b11589f12a339c92e2 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
This commit is contained in:
Jan Tojnar
2021-01-07 13:04:31 +01:00
parent 0e4e47512d 2be707eca8
commit f19eb635b4
457 changed files with 8204 additions and 3941 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/solarus-quest-editor/default.nix
+13 -4
View File
@@ -1,7 +1,9 @@
{ stdenv, fetchFromGitLab, cmake, luajit, SDL2, SDL2_image, SDL2_ttf, physfs
, openal, libmodplug, libvorbis, solarus, qtbase, qttools, glm }:
{ lib, mkDerivation, fetchFromGitLab, cmake, luajit
, SDL2, SDL2_image, SDL2_ttf, physfs, fetchpatch
, openal, libmodplug, libvorbis, solarus
, qtbase, qttools, glm }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "solarus-quest-editor";
version = "1.6.4";
@@ -12,12 +14,19 @@ stdenv.mkDerivation rec {
sha256 = "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn";
};
patches = [
(fetchpatch {
url = "https://gitlab.com/solarus-games/solarus-quest-editor/-/commit/81d5c7f1602cf355684d70a5e3449fefccfc44b8.patch";
sha256 = "tVUxkkDp2PcOHGy4dGvUcYj9gF7k4LN21VuxohCw9NE=";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [ luajit SDL2 SDL2_image SDL2_ttf physfs openal
libmodplug libvorbis solarus qtbase qttools glm ];
meta = with stdenv.lib; {
meta = with lib; {
description = "The editor for the Zelda-like ARPG game engine, Solarus";
longDescription = ''
Solarus is a game engine for Zelda-like ARPG games written in lua.