diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 10:36:23 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 15:09:47 -0500 |
| commit | 0331d7e7a7d2d5d1cf9486b5ef0b1adb1d8e2ddb (patch) | |
| tree | 24503f8b7e29a283f5273134031455c7885887ae /pkgs | |
| parent | 5ecc06293a56583001e33b5dd7340192fcdefc72 (diff) | |
| download | nixpkgs-0331d7e7a7d2d5d1cf9486b5ef0b1adb1d8e2ddb.tar nixpkgs-0331d7e7a7d2d5d1cf9486b5ef0b1adb1d8e2ddb.tar.gz nixpkgs-0331d7e7a7d2d5d1cf9486b5ef0b1adb1d8e2ddb.tar.bz2 nixpkgs-0331d7e7a7d2d5d1cf9486b5ef0b1adb1d8e2ddb.tar.lz nixpkgs-0331d7e7a7d2d5d1cf9486b5ef0b1adb1d8e2ddb.tar.xz nixpkgs-0331d7e7a7d2d5d1cf9486b5ef0b1adb1d8e2ddb.tar.zst nixpkgs-0331d7e7a7d2d5d1cf9486b5ef0b1adb1d8e2ddb.zip | |
flightgear: build with Qt 5.5
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/games/flightgear/default.nix | 4 | ||||
| -rw-r--r-- | 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 b1371e2f478..b55a37e9985 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 bf5c63b1fe2..84e70d7c54c 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 { }; |