diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 72c8a49939d3..1e1b8130e377 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,5 +1,5 @@ -{ fetchFromGitHub, lib, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU, libGL, boost, - pkg-config, libuuid, openal, ogre, ois, curl, gtk2, mygui, unzip, +{ fetchFromGitHub, lib, stdenv, wxGTK30-gtk3, freeimage, cmake, zziplib, libGLU, libGL, boost, + pkg-config, libuuid, openal, ogre, ois, curl, gtk3, mygui, unzip, angelscript, ogrepaged, mysocketw, libxcb }: @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { sha256 = "0cb1il7qm45kfhh6h6jwfpxvjlh2dmg8z1yz9kj4d6098myf2lg4"; }; + patches = [ + ./gtk3.patch + ]; + installPhase = '' sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg mkdir -p $out/share/rigsofrods @@ -24,8 +28,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake pkg-config unzip ]; - buildInputs = [ wxGTK30 freeimage zziplib libGLU libGL boost - libuuid openal ogre ois curl gtk2 mygui angelscript + buildInputs = [ wxGTK30-gtk3 freeimage zziplib libGLU libGL boost + libuuid openal ogre ois curl gtk3 mygui angelscript ogrepaged mysocketw libxcb ]; meta = with lib; { @@ -34,6 +38,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; - hydraPlatforms = []; }; } diff --git a/pkgs/games/rigsofrods/gtk3.patch b/pkgs/games/rigsofrods/gtk3.patch new file mode 100644 index 000000000000..e873cfedbaed --- /dev/null +++ b/pkgs/games/rigsofrods/gtk3.patch @@ -0,0 +1,29 @@ +diff --git a/cmake/DependenciesConfig.cmake b/cmake/DependenciesConfig.cmake +index 1bdf93c..4773fca 100644 +--- a/cmake/DependenciesConfig.cmake ++++ b/cmake/DependenciesConfig.cmake +@@ -187,10 +187,8 @@ endmacro(importLib) + + ELSEIF(UNIX) + find_package(PkgConfig) +- PKG_CHECK_MODULES (GTK gtk+-2.0 REQUIRED) +- PKG_CHECK_MODULES (GTK_PIXBUF gdk-pixbuf-2.0 REQUIRED) ++ PKG_CHECK_MODULES (GTK gtk+-3.0 REQUIRED) + include_directories(${GTK_INCLUDE_DIRS}) +- include_directories(${GTK_PIXBUF_INCLUDE_DIRS}) + + # Ogre basics + PKG_CHECK_MODULES (Ogre OGRE REQUIRED) +diff --git a/source/configurator/CMakeLists.txt b/source/configurator/CMakeLists.txt +index 51cc350..7f723b6 100644 +--- a/source/configurator/CMakeLists.txt ++++ b/source/configurator/CMakeLists.txt +@@ -56,7 +56,7 @@ IF(WIN32) + endif(ROR_USE_OPENCL) + ELSEIF(UNIX) + find_package(PkgConfig) +- PKG_CHECK_MODULES (GTK gtk+-2.0 REQUIRED) ++ PKG_CHECK_MODULES (GTK gtk+-3.0 REQUIRED) + INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS}) + + PKG_CHECK_MODULES (Ogre OGRE REQUIRED)