diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-02-23 20:32:12 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-02-23 20:32:12 +0100 |
| commit | 82a0df8bad1c25525034a59d03189ba850cb52ae (patch) | |
| tree | e79f1d898f51e6b3752cf1c35b49c002d37650a9 /pkgs | |
| parent | 871c9ff726792cf093f72aec9ffd35d91f66a1d1 (diff) | |
| download | nixlib-82a0df8bad1c25525034a59d03189ba850cb52ae.tar nixlib-82a0df8bad1c25525034a59d03189ba850cb52ae.tar.gz nixlib-82a0df8bad1c25525034a59d03189ba850cb52ae.tar.bz2 nixlib-82a0df8bad1c25525034a59d03189ba850cb52ae.tar.lz nixlib-82a0df8bad1c25525034a59d03189ba850cb52ae.tar.xz nixlib-82a0df8bad1c25525034a59d03189ba850cb52ae.tar.zst nixlib-82a0df8bad1c25525034a59d03189ba850cb52ae.zip | |
flightgear: fix build via update; but no testing, hope it works
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/games/flightgear/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index fe90156d84cf..fa0bb9bb4f7c 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -1,23 +1,23 @@ x@{builderDefsPackage , freeglut, freealut, mesa, libICE, libjpeg, openal, openscenegraph, plib , libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto - , libXmu, libXt, simgear, zlib, boost + , libXmu, libXt, simgear, zlib, boost, cmake, libpng , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { - baseName="FlightGear"; - version="2.0.0"; + baseName="flightgear"; + version="2.10.0"; name="${baseName}-${version}"; - extension="tar.gz"; + extension="tar.bz2"; url="http://ftp.linux.kiev.ua/pub/fgfs/Source/${name}.${extension}"; - hash="17h7ns955xkd0cakfk22aym0id65rd8kylcamkmycbgnnhs4b1wg"; + hash="0pq5nwyxwp8ar5rr0jh8p04bv0i9i841m374jwd748csnsn28zh6"; }; in rec { @@ -35,14 +35,14 @@ rec { inherit buildInputs; /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall" "deployData"]; + phaseNames = ["doCmake" "doMakeInstall" "deployData"]; deployData = a.fullDepEntry '' mkdir -p "$out/share/FlightGear" cd "$out/share/FlightGear" tar xvf ${datasrc} '' ["minInit" "defEnsureDir"]; - + meta = { description = "A flight simulator"; maintainers = with a.lib.maintainers; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7fe618bce63..290b841553e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8122,7 +8122,7 @@ let libpng = libpng12; }; - flightgear = callPackage ../games/flightgear {}; + flightgear = callPackage ../games/flightgear { }; freeciv = callPackage ../games/freeciv { }; |