diff options
| author | gnidorah <gnidorah@users.noreply.github.com> | 2020-06-18 19:49:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-18 12:49:27 -0400 |
| commit | 5b3eac040b090f756885bb95733aca0ce98a3c80 (patch) | |
| tree | e13d999f52a68704deb3c8f3abb09efc5a3bf555 /pkgs/games/openmw | |
| parent | b713e97c304f3cdb567b62f90fd6c794da01bf47 (diff) | |
| download | nixlib-5b3eac040b090f756885bb95733aca0ce98a3c80.tar nixlib-5b3eac040b090f756885bb95733aca0ce98a3c80.tar.gz nixlib-5b3eac040b090f756885bb95733aca0ce98a3c80.tar.bz2 nixlib-5b3eac040b090f756885bb95733aca0ce98a3c80.tar.lz nixlib-5b3eac040b090f756885bb95733aca0ce98a3c80.tar.xz nixlib-5b3eac040b090f756885bb95733aca0ce98a3c80.tar.zst nixlib-5b3eac040b090f756885bb95733aca0ce98a3c80.zip | |
openmw-tes3mp: fix build after #80624 (#91045)
Diffstat (limited to 'pkgs/games/openmw')
| -rw-r--r-- | pkgs/games/openmw/tes3mp.nix | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 59bdc6901078..df332c0e5bf3 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -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 @@ -28,6 +28,17 @@ let rev = "24aae91d9ddad38cdb3b0e0a13af59f142803e94"; 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 { version = "2019-11-19"; name = "openmw-tes3mp-${version}"; @@ -41,7 +52,7 @@ in openmw.overrideAttrs (oldAttrs: rec { }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ]; - buildInputs = oldAttrs.buildInputs ++ [ luajit ]; + buildInputs = [ luajit mygui_ ] ++ oldAttrs.buildInputs; cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DBUILD_OPENCS=OFF" @@ -50,7 +61,7 @@ in openmw.overrideAttrs (oldAttrs: rec { "-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 = [ ./tes3mp.patch ]; |