diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-09-28 19:09:17 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-09-28 19:12:49 +0200 |
commit | dffd77b037c48a845cac73aa2edf6234d2210987 (patch) | |
tree | ce3069809365a02ae7e48131edd87f0eedae15f1 /pkgs/games/flightgear/default.nix | |
parent | 1e0ec4216f2c4d26f96c738ae956cd6cde5e0c09 (diff) | |
download | nixlib-dffd77b037c48a845cac73aa2edf6234d2210987.tar nixlib-dffd77b037c48a845cac73aa2edf6234d2210987.tar.gz nixlib-dffd77b037c48a845cac73aa2edf6234d2210987.tar.bz2 nixlib-dffd77b037c48a845cac73aa2edf6234d2210987.tar.lz nixlib-dffd77b037c48a845cac73aa2edf6234d2210987.tar.xz nixlib-dffd77b037c48a845cac73aa2edf6234d2210987.tar.zst nixlib-dffd77b037c48a845cac73aa2edf6234d2210987.zip |
flightgear: 2016.4.4 -> 2017.3.1 for CVE-2017-13709
Diffstat (limited to 'pkgs/games/flightgear/default.nix')
-rw-r--r-- | pkgs/games/flightgear/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 2d7f5566c5d2..743194269917 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -2,18 +2,18 @@ , 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, qtbase +, makeDesktopItem, qtbase, qtdeclarative, glew }: let - version = "2016.4.4"; - shortVersion = "2016.4"; + version = "2017.3.1"; + shortVersion = "2017.3"; data = stdenv.mkDerivation rec { name = "flightgear-base-${version}"; src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2"; - sha256 = "0s4nlkwi9jfc408agsl0w5xl3vajrvplc66k3nwg92wsr614pz9x"; + sha256 = "166q0fsbp17lx1l1n6i8cfk3d1i79pasz1liya09z6m2i1pb026z"; }; phases = [ "installPhase" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2"; - sha256 = "1z7s9m2g85g8q9zxawhpal84rq2jin1ppchshbwi460gwk5r46fm"; + sha256 = "1kccf91vmxnzyki6grx09s10dvr4j6qrz34ikj7jn81g5scisbkg"; }; # Of all the files in the source and data archives, there doesn't seem to be @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { 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 qtbase + glew qtdeclarative ]; postInstall = '' @@ -66,10 +67,10 @@ stdenv.mkDerivation rec { do wrapProgram $f --set FG_ROOT "${data}/share/FlightGear" done - - ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Flight simulator"; maintainers = with maintainers; [ raskin the-kenny ]; |