simgear: fix via update

+12 -12
+11 -11
pkgs/development/libraries/simgear/default.nix
··· 1 1 x@{builderDefsPackage 2 2 , plib, freeglut, xproto, libX11, libXext, xextproto, libXi , inputproto 3 3 , libICE, libSM, libXt, libXmu, mesa, boost, zlib, libjpeg , freealut 4 - , openscenegraph, openal 4 + , openscenegraph, openal, expat, cmake 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="SimGear"; 16 - version="2.0.0"; 15 + baseName="simgear"; 16 + version="2.10.0"; 17 17 name="${baseName}-${version}"; 18 - extension="tar.gz"; 19 - url="ftp://ftp.goflyflightgear.com/simgear/Source/${name}.${extension}"; 20 - hash="08fia5rjrlvw45i3v09fn90vhdhb54wjl6kn3d8vpspxmsw4fn55"; 18 + extension="tar.bz2"; 19 + url="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.${extension}"; 20 + hash="0pb148hb35p1c5iz0kpiclmswjl9bax9xfm087ldpxsqg9a0sb2q"; 21 21 }; 22 22 in 23 23 rec { ··· 30 30 inherit buildInputs; 31 31 32 32 /* doConfigure should be removed if not needed */ 33 - phaseNames = ["doConfigure" "doMakeInstall"]; 34 - 33 + phaseNames = [ "doCmake" "doMakeInstall" ]; 34 + 35 35 meta = { 36 36 description = "Simulation construction toolkit"; 37 37 maintainers = with a.lib.maintainers;
+1 -1
pkgs/top-level/all-packages.nix
··· 4848 4848 4849 4849 silgraphite = callPackage ../development/libraries/silgraphite {}; 4850 4850 4851 - simgear = callPackage ../development/libraries/simgear {}; 4851 + simgear = callPackage ../development/libraries/simgear { }; 4852 4852 4853 4853 sfml_git = callPackage ../development/libraries/sfml { }; 4854 4854