From 2d03ed2f8d83b07ca45545c42addcf90948dd4b0 Mon Sep 17 00:00:00 2001 From: marius851000 Date: Thu, 14 Mar 2019 15:53:34 +0100 Subject: [PATCH] openmw: force the need of qt5 --- pkgs/games/openmw/default.nix | 11 +++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index bb7c2c4eeb68..47527a13b7b7 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchFromGitHub, qt5, qt4, openscenegraph, mygui, bullet, ffmpeg -, boost, cmake, SDL2, unshield, openal, libXt, pkgconfig -, useQt5 ? true }: +{ stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg +, boost, cmake, SDL2, unshield, openal, libXt, pkgconfig }: let openscenegraph_ = openscenegraph.overrideDerivation (self: { @@ -25,10 +24,10 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake boost ffmpeg bullet mygui openscenegraph_ SDL2 unshield openal libXt ] - ++ [ (if useQt5 then qt5.qtbase else qt4) ]; + buildInputs = [ cmake boost ffmpeg bullet mygui openscenegraph_ SDL2 unshield openal libXt qtbase ]; + cmakeFlags = [ - "-DDESIRED_QT_VERSION:INT=${if useQt5 then "5" else "4"}" + "-DDESIRED_QT_VERSION:INT=5" ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4475555253c..758ac50ca9dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20866,7 +20866,7 @@ in openjk = callPackage ../games/openjk { }; - openmw = callPackage ../games/openmw { }; + openmw = libsForQt5.callPackage ../games/openmw { }; openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { };