diff options
| author | Orivej Desh <orivej@gmx.fr> | 2020-03-25 17:36:13 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2020-03-25 23:01:42 +0000 |
| commit | 87f75f8e35749394af36e0cb86b323c32262c947 (patch) | |
| tree | 17cd0f420b872e27e4e98d0d9bb000e4a134e324 | |
| parent | 517fd073fc7850d42f6a1bac3b7a156c6dd3a7f0 (diff) | |
| download | nixpkgs-87f75f8e35749394af36e0cb86b323c32262c947.tar nixpkgs-87f75f8e35749394af36e0cb86b323c32262c947.tar.gz nixpkgs-87f75f8e35749394af36e0cb86b323c32262c947.tar.bz2 nixpkgs-87f75f8e35749394af36e0cb86b323c32262c947.tar.lz nixpkgs-87f75f8e35749394af36e0cb86b323c32262c947.tar.xz nixpkgs-87f75f8e35749394af36e0cb86b323c32262c947.tar.zst nixpkgs-87f75f8e35749394af36e0cb86b323c32262c947.zip | |
performous: fix build
| -rw-r--r-- | pkgs/games/performous/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/performous/performous-cmake.patch | 86 |
2 files changed, 88 insertions, 0 deletions
diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix index 28487a7f8e8..96b07e9787e 100644 --- a/pkgs/games/performous/default.nix +++ b/pkgs/games/performous/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { sha256 = "08j0qhr65l7qnd5vxl4l07523qpvdwi31h4vzl3lfiinx1zcgr4x"; }; + patches = [ ./performous-cmake.patch ]; + nativeBuildInputs = [ cmake pkgconfig gettext ]; buildInputs = [ diff --git a/pkgs/games/performous/performous-cmake.patch b/pkgs/games/performous/performous-cmake.patch new file mode 100644 index 00000000000..59d2cc9a927 --- /dev/null +++ b/pkgs/games/performous/performous-cmake.patch @@ -0,0 +1,86 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.6) + project(Performous CXX C) + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") +--- a/cmake/Modules/FindPango.cmake ++++ b/cmake/Modules/FindPango.cmake +@@ -2,31 +2,10 @@ + # Once done, this will define + # + # Pango_FOUND - system has Pango +-# Pango_INCLUDE_DIRS - the Pango include directories + # Pango_LIBRARIES - link these to use Pango + + include(LibFindMacros) + +-# Dependencies +-libfind_package(Pango Freetype) +-libfind_package(Pango Glib) +-libfind_package(Pango GObject) +- +-# Use pkg-config to get hints about paths +-libfind_pkg_check_modules(Pango_PKGCONF pango) +- +-# Include dir +-find_path(Pango_INCLUDE_DIR +- NAMES pango/pango.h +- HINTS ${Pango_PKGCONF_INCLUDE_DIRS} +- PATH_SUFFIXES pango-1.0 +-) +- +-# Finally the library itself +-find_library(Pango_LIBRARY +- NAMES pango-1.0 +- HINTS ${Pango_PKGCONF_LIBRARY_DIRS} +-) +- ++libfind_pkg_check_modules(Pango_PKGCONF IMPORTED_TARGET pango) ++set(Pango_LIBRARY PkgConfig::Pango_PKGCONF) + libfind_process(Pango) +- +--- a/cmake/Modules/FindPangoCairo.cmake ++++ b/cmake/Modules/FindPangoCairo.cmake +@@ -1,35 +1,11 @@ + # - Try to find PangoCairo + # Once done, this will define + # +-# PangoCairo_FOUND - system has Pango +-# PangoCairo_INCLUDE_DIRS - the Pango include directories +-# PangoCairo_LIBRARIES - link these to use Pango ++# PangoCairo_FOUND - system has PangoCairo ++# PangoCairo_LIBRARIES - link these to use PangoCairo + + include(LibFindMacros) + +-# Dependencies +-libfind_package(PangoCairo Pango) +-libfind_package(PangoCairo Cairo) +- +-# Use pkg-config to get hints about paths +-libfind_pkg_check_modules(PangoCairo_PKGCONF pangocairo) +- +-# Include dir +-find_path(PangoCairo_INCLUDE_DIR +- NAMES pango/pangocairo.h +- HINTS ${PangoCairo_PKGCONF_INCLUDE_DIRS} +- PATH_SUFFIXES pango-1.0 +-) +- +-# Finally the library itself +-find_library(PangoCairo_LIBRARY +- NAMES pangocairo-1.0 +- HINTS ${PangoCairo_PKGCONF_LIBRARY_DIRS} +-) +- +-# Set the include dir variables and the libraries and let libfind_process do the rest. +-# NOTE: Singular variables for this library, plural for libraries this this lib depends on. +-set(PangoCairo_PROCESS_INCLUDES PangoCairo_INCLUDE_DIR Pango_INCLUDE_DIR Cairo_INCLUDE_DIR) +-set(PangoCairo_PROCESS_LIBS PangoCairo_LIBRARY Pango_LIBRARY Cairo_LIBRARY) ++libfind_pkg_check_modules(PangoCairo_PKGCONF IMPORTED_TARGET pangocairo) ++set(PangoCairo_LIBRARY PkgConfig::PangoCairo_PKGCONF) + libfind_process(PangoCairo) +- |