From 0331d7e7a7d2d5d1cf9486b5ef0b1adb1d8e2ddb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:36:23 -0500 Subject: [PATCH] flightgear: build with Qt 5.5 --- pkgs/games/flightgear/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index b1371e2f4788..b55a37e99857 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -2,7 +2,7 @@ , freeglut, freealut, mesa, libICE, libjpeg, openal, openscenegraph, plib , libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr -, makeDesktopItem, qt5 +, makeDesktopItem, qtbase }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ freeglut freealut mesa libICE libjpeg openal openscenegraph plib libSM libunwind libX11 xproto libXext xextproto libXi inputproto - libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qt5.base + libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qtbase ]; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf5c63b1fe27..84e70d7c54ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13559,7 +13559,7 @@ let fairymax = callPackage ../games/fairymax {}; - flightgear = callPackage ../games/flightgear { }; + flightgear = qt5Libs.callPackage ../games/flightgear { }; freecell-solver = callPackage ../games/freecell-solver { };