flightgear: build with Qt 5.5

This commit is contained in:
Thomas Tuegel 2015-09-27 10:36:23 -05:00
parent 5ecc06293a
commit 0331d7e7a7
2 changed files with 3 additions and 3 deletions

View file

@ -2,7 +2,7 @@
, freeglut, freealut, mesa, libICE, libjpeg, openal, openscenegraph, plib , freeglut, freealut, mesa, libICE, libjpeg, openal, openscenegraph, plib
, libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto , libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto
, libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr
, makeDesktopItem, qt5 , makeDesktopItem, qtbase
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
freeglut freealut mesa libICE libjpeg openal openscenegraph plib freeglut freealut mesa libICE libjpeg openal openscenegraph plib
libSM libunwind libX11 xproto libXext xextproto libXi inputproto 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 = '' preConfigure = ''

View file

@ -13559,7 +13559,7 @@ let
fairymax = callPackage ../games/fairymax {}; fairymax = callPackage ../games/fairymax {};
flightgear = callPackage ../games/flightgear { }; flightgear = qt5Libs.callPackage ../games/flightgear { };
freecell-solver = callPackage ../games/freecell-solver { }; freecell-solver = callPackage ../games/freecell-solver { };