diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2017-12-31 12:26:57 +0100 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2018-01-09 00:46:34 +0000 |
| commit | 56ec6ee97e671fd02057ea7a9d4174fb96cac58e (patch) | |
| tree | a7e31c6e9905d1d2b85d63b5a75de8ab9c715ac5 /pkgs/development/libraries/ogrepaged | |
| parent | a1c21efdad97338ec48243aaa135b0d3b0054811 (diff) | |
| download | nixpkgs-56ec6ee97e671fd02057ea7a9d4174fb96cac58e.tar nixpkgs-56ec6ee97e671fd02057ea7a9d4174fb96cac58e.tar.gz nixpkgs-56ec6ee97e671fd02057ea7a9d4174fb96cac58e.tar.bz2 nixpkgs-56ec6ee97e671fd02057ea7a9d4174fb96cac58e.tar.lz nixpkgs-56ec6ee97e671fd02057ea7a9d4174fb96cac58e.tar.xz nixpkgs-56ec6ee97e671fd02057ea7a9d4174fb96cac58e.tar.zst nixpkgs-56ec6ee97e671fd02057ea7a9d4174fb96cac58e.zip | |
ogrepaged: patch to make it build with ogre-1.10
Diffstat (limited to 'pkgs/development/libraries/ogrepaged')
| -rw-r--r-- | pkgs/development/libraries/ogrepaged/default.nix | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index 2408c3e4904..e4045bcd5dc 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, ois, ogre, libX11, boost }: +{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, ois, ogre, libX11, boost }: stdenv.mkDerivation rec { name = "ogre-paged-${version}"; @@ -9,6 +9,23 @@ stdenv.mkDerivation rec { 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 ]; nativeBuildInputs = [ cmake pkgconfig ]; |