flightgear: fix build via update; but no testing, hope it works

+11 -11
+10 -10
pkgs/games/flightgear/default.nix
··· 1 1 x@{builderDefsPackage 2 2 , freeglut, freealut, mesa, libICE, libjpeg, openal, openscenegraph, plib 3 3 , libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto 4 - , libXmu, libXt, simgear, zlib, boost 4 + , libXmu, libXt, simgear, zlib, boost, cmake, libpng 5 5 , ...}: 6 6 builderDefsPackage 7 - (a : 8 - let 9 - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 7 + (a : 8 + let 9 + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 10 10 []; 11 11 12 12 buildInputs = map (n: builtins.getAttr n x) 13 13 (builtins.attrNames (builtins.removeAttrs x helperArgNames)); 14 14 sourceInfo = rec { 15 - baseName="FlightGear"; 16 - version="2.0.0"; 15 + baseName="flightgear"; 16 + version="2.10.0"; 17 17 name="${baseName}-${version}"; 18 - extension="tar.gz"; 18 + extension="tar.bz2"; 19 19 url="http://ftp.linux.kiev.ua/pub/fgfs/Source/${name}.${extension}"; 20 - hash="17h7ns955xkd0cakfk22aym0id65rd8kylcamkmycbgnnhs4b1wg"; 20 + hash="0pq5nwyxwp8ar5rr0jh8p04bv0i9i841m374jwd748csnsn28zh6"; 21 21 }; 22 22 in 23 23 rec { ··· 35 35 inherit buildInputs; 36 36 37 37 /* doConfigure should be removed if not needed */ 38 - phaseNames = ["doConfigure" "doMakeInstall" "deployData"]; 38 + phaseNames = ["doCmake" "doMakeInstall" "deployData"]; 39 39 40 40 deployData = a.fullDepEntry '' 41 41 mkdir -p "$out/share/FlightGear" 42 42 cd "$out/share/FlightGear" 43 43 tar xvf ${datasrc} 44 44 '' ["minInit" "defEnsureDir"]; 45 - 45 + 46 46 meta = { 47 47 description = "A flight simulator"; 48 48 maintainers = with a.lib.maintainers;
+1 -1
pkgs/top-level/all-packages.nix
··· 8122 8122 libpng = libpng12; 8123 8123 }; 8124 8124 8125 - flightgear = callPackage ../games/flightgear {}; 8125 + flightgear = callPackage ../games/flightgear { }; 8126 8126 8127 8127 freeciv = callPackage ../games/freeciv { }; 8128 8128