ogrepaged: patch to make it build with ogre-1.10

This commit is contained in:
Bas van Dijk 2017-12-31 12:26:57 +01:00 committed by Orivej Desh
parent a1c21efdad
commit 56ec6ee97e

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig, ois, ogre, libX11, boost }: { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, ois, ogre, libX11, boost }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ogre-paged-${version}"; name = "ogre-paged-${version}";
@ -9,6 +9,23 @@ stdenv.mkDerivation rec {
sha256 = "17j7rw9wbkynxbhm2lay3qgjnnagb2vd5jn9iijnn2lf8qzbgy82"; sha256 = "17j7rw9wbkynxbhm2lay3qgjnnagb2vd5jn9iijnn2lf8qzbgy82";
}; };
patches = [
# These patches come from https://github.com/RigsOfRods/ogre-pagedgeometry/pull/6
# and make ogre-paged build with ogre-1.10.
(fetchpatch {
url = "https://github.com/RigsOfRods/ogre-pagedgeometry/commit/2d4df577decba37ec3cdafc965deae0f6d31fe45.patch";
sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
})
(fetchpatch {
url = "https://github.com/RigsOfRods/ogre-pagedgeometry/commit/4d81789ec6f55e294a5ad040ea7abe2b415cbc92.patch";
sha256 = "17q8djdz2y3g46azxc3idhyvi6vf0sqkxld4bbyp3l9zn7dq76rp";
})
(fetchpatch {
url = "https://github.com/RigsOfRods/ogre-pagedgeometry/commit/10f7c5ce5b422e9cbac59d466f3567a24c8831a4.patch";
sha256 = "1kk0dbadzg73ai99l3w04q51sil36vzbkaqc79mdwy0vjrn4ardb";
})
];
buildInputs = [ ois ogre libX11 boost ]; buildInputs = [ ois ogre libX11 boost ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];