forked from mirrors/nixpkgs
openmw: enable with glibc fix
This commit is contained in:
parent
90bd7d7389
commit
fb7287e6d2
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
|
@ -55,6 +56,13 @@ mkDerivation rec {
|
|||
sha256 = "sha256-Xq9hDUTCQr79Zzjk0CsiXclVTHK6nrSowukIQqVdrKY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/OpenMW/openmw/-/merge_requests/1239.diff";
|
||||
sha256 = "sha256-RhbIGeE6GyqnipisiMTwWjcFnIiR055hUPL8IkjPgZw=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -83,10 +91,5 @@ mkDerivation rec {
|
|||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ abbradar marius851000 ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
# 2021-10-13, doesn't compile with glibc-2.34, maintainers prefer a fix on glibc's end.
|
||||
# Can be marked as un-broken as soon as https://gitlab.com/OpenMW/openmw/-/merge_requests/1239
|
||||
# is resolved and a patch is appliable here.
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -87,7 +87,7 @@ let
|
|||
'';
|
||||
|
||||
# https://github.com/TES3MP/openmw-tes3mp/issues/552
|
||||
patches = [ ./tes3mp.patch ];
|
||||
patches = oldAttrs.patches ++ [ ./tes3mp.patch ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-fpermissive";
|
||||
|
||||
|
@ -108,6 +108,7 @@ let
|
|||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
broken = true;
|
||||
};
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in a new issue