diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2013-10-06 21:36:18 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2013-10-06 22:38:48 +0200 |
| commit | 1a062d1456c37cb45d58fb3325b4db39f96ca118 (patch) | |
| tree | 767564e7a50ea901e30bbae3b30d6ab53fff74f4 /pkgs/development/libraries/simgear | |
| parent | 866d57d93de5034c6895042a28571fcf0f036115 (diff) | |
| download | nixpkgs-1a062d1456c37cb45d58fb3325b4db39f96ca118.tar nixpkgs-1a062d1456c37cb45d58fb3325b4db39f96ca118.tar.gz nixpkgs-1a062d1456c37cb45d58fb3325b4db39f96ca118.tar.bz2 nixpkgs-1a062d1456c37cb45d58fb3325b4db39f96ca118.tar.lz nixpkgs-1a062d1456c37cb45d58fb3325b4db39f96ca118.tar.xz nixpkgs-1a062d1456c37cb45d58fb3325b4db39f96ca118.tar.zst nixpkgs-1a062d1456c37cb45d58fb3325b4db39f96ca118.zip | |
flightgear: 2.10.0 -> 2.12.0 (and make it run again)
The current FlightGear expression doesn't work:
bash$ nix-build -A flightgear
/nix/store/3c47sibzb9h1vhnn0gnh692hkpjc5p5v-flightgear-2.10.0
bash$ ./result/bin/fgfs
ERROR: The path '/nix/store/3c47sibzb9h1vhnn0gnh692hkpjc5p5v-flightgear-2.10.0/lib/FlightGear' does not exist in the file system.
Base package check failed:
Version [none] found at: /nix/store/3c47sibzb9h1vhnn0gnh692hkpjc5p5v-flightgear-2.10.0/lib/FlightGear
Version 2.10.0 is required.
Please upgrade/downgrade base package and set the path to your fgdata
with --fg-root=path_to_your_fgdata
We could probably make the 2.10.0 version run, but I had already
upgraded it to 2.12.0 before I made it work. It seems only the data dir
configuration was wrong/missing: FG_DATA_DIR="$out/share/FlightGear/".
Simgear must be in version sync with flightgear, hence the upgrade.
Most of the diff is because I rewrote the flightgear expression to what
I think is the "new style". I wanted to add a preConfigure phase but
didn't understand why this expression had custom phases. So I just
rewrote the whole thing to something I consider more readable.
Diffstat (limited to 'pkgs/development/libraries/simgear')
| -rw-r--r-- | pkgs/development/libraries/simgear/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index de8e1d1df1d..cb534cfbf31 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -1,7 +1,7 @@ x@{builderDefsPackage , plib, freeglut, xproto, libX11, libXext, xextproto, libXi , inputproto , libICE, libSM, libXt, libXmu, mesa, boost, zlib, libjpeg , freealut - , openscenegraph, openal, expat, cmake + , openscenegraph, openal, expat, cmake, apr , ...}: builderDefsPackage (a : @@ -13,11 +13,11 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="simgear"; - version="2.10.0"; + version="2.12.0"; name="${baseName}-${version}"; extension="tar.bz2"; url="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.${extension}"; - hash="0pb148hb35p1c5iz0kpiclmswjl9bax9xfm087ldpxsqg9a0sb2q"; + hash="0spl6afk8rm96ss4lh7zy5561m5m2qgwsnqjyp35jr1gyyrc944f"; }; in rec { |