public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openmw: force the need of qt5

Browse Source
This commit is contained in:
marius851000 2019-03-14 15:53:34 +01:00
parent 610757e024
commit 2d03ed2f8d
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/games/openmw/default.nix
View File

@ -1,6 +1,5 @@
{ stdenv, fetchFromGitHub, qt5, qt4, openscenegraph, mygui, bullet, ffmpeg { stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg
, boost, cmake, SDL2, unshield, openal, libXt, pkgconfig , boost, cmake, SDL2, unshield, openal, libXt, pkgconfig }:
, useQt5 ? true }:
let let
openscenegraph_ = openscenegraph.overrideDerivation (self: { openscenegraph_ = openscenegraph.overrideDerivation (self: {
@ -25,10 +24,10 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake boost ffmpeg bullet mygui openscenegraph_ SDL2 unshield openal libXt ] buildInputs = [ cmake boost ffmpeg bullet mygui openscenegraph_ SDL2 unshield openal libXt qtbase ];
++ [ (if useQt5 then qt5.qtbase else qt4) ];
cmakeFlags = [ cmakeFlags = [
"-DDESIRED_QT_VERSION:INT=${if useQt5 then "5" else "4"}" "-DDESIRED_QT_VERSION:INT=5"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/top-level/all-packages.nix
View File

@ -20866,7 +20866,7 @@ in
openjk = callPackage ../games/openjk { }; openjk = callPackage ../games/openjk { };
openmw = callPackage ../games/openmw { }; openmw = libsForQt5.callPackage ../games/openmw { };
openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { };