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

openmw-tes3mp: fix build after #80624 (#91045)

Browse Source
This commit is contained in:
gnidorah 2020-06-18 19:49:27 +03:00 committed by GitHub
parent b713e97c30
commit 5b3eac040b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/games/openmw/tes3mp.nix
View File

@ -1,4 +1,4 @@
{ stdenv, cmake, openmw, fetchFromGitHub, luajit, makeWrapper }: { stdenv, cmake, openmw, fetchFromGitHub, luajit, makeWrapper, mygui }:
# revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy # revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy
@ -28,6 +28,17 @@ let
rev = "24aae91d9ddad38cdb3b0e0a13af59f142803e94"; rev = "24aae91d9ddad38cdb3b0e0a13af59f142803e94";
sha256 = "1rfmxxr9ircfagdpbdrzl26msdhx1i3g974cblbv69078cradfh3"; sha256 = "1rfmxxr9ircfagdpbdrzl26msdhx1i3g974cblbv69078cradfh3";
}; };
# https://github.com/TES3MP/openmw-tes3mp/issues/555
mygui_ = mygui.overrideAttrs (oldAttrs: rec {
version = "3.2.2";
src = fetchFromGitHub {
owner = "MyGUI";
repo = "mygui";
rev = "MyGUI${version}";
sha256 = "1wk7jmwm55rhlqqcyvqsxdmwvl70bysl9azh4kd9n57qlmgk3zmw";
};
});
in openmw.overrideAttrs (oldAttrs: rec { in openmw.overrideAttrs (oldAttrs: rec {
version = "2019-11-19"; version = "2019-11-19";
name = "openmw-tes3mp-${version}"; name = "openmw-tes3mp-${version}";
@ -41,7 +52,7 @@ in openmw.overrideAttrs (oldAttrs: rec {
}; };
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ]; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ];
buildInputs = oldAttrs.buildInputs ++ [ luajit ]; buildInputs = [ luajit mygui_ ] ++ oldAttrs.buildInputs;
cmakeFlags = oldAttrs.cmakeFlags ++ [ cmakeFlags = oldAttrs.cmakeFlags ++ [
"-DBUILD_OPENCS=OFF" "-DBUILD_OPENCS=OFF"
@ -50,7 +61,7 @@ in openmw.overrideAttrs (oldAttrs: rec {
"-DRakNet_LIBRARY_DEBUG=${rakNetLibrary}/lib/libRakNetLibStatic.a" "-DRakNet_LIBRARY_DEBUG=${rakNetLibrary}/lib/libRakNetLibStatic.a"
]; ];
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95175 # https://github.com/TES3MP/openmw-tes3mp/issues/552
patches = [ patches = [
./tes3mp.patch ./tes3mp.patch
]; ];