forked from mirrors/nixpkgs
Merge pull request #1050 from bjornfor/flightgear
flightgear: 2.10.0 -> 2.12.0 (and make it run again)
This commit is contained in:
commit
eb385aa109
|
@ -1,7 +1,7 @@
|
||||||
x@{builderDefsPackage
|
x@{builderDefsPackage
|
||||||
, plib, freeglut, xproto, libX11, libXext, xextproto, libXi , inputproto
|
, plib, freeglut, xproto, libX11, libXext, xextproto, libXi , inputproto
|
||||||
, libICE, libSM, libXt, libXmu, mesa, boost, zlib, libjpeg , freealut
|
, libICE, libSM, libXt, libXmu, mesa, boost, zlib, libjpeg , freealut
|
||||||
, openscenegraph, openal, expat, cmake
|
, openscenegraph, openal, expat, cmake, apr
|
||||||
, ...}:
|
, ...}:
|
||||||
builderDefsPackage
|
builderDefsPackage
|
||||||
(a :
|
(a :
|
||||||
|
@ -13,11 +13,11 @@ let
|
||||||
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
||||||
sourceInfo = rec {
|
sourceInfo = rec {
|
||||||
baseName="simgear";
|
baseName="simgear";
|
||||||
version="2.10.0";
|
version="2.12.0";
|
||||||
name="${baseName}-${version}";
|
name="${baseName}-${version}";
|
||||||
extension="tar.bz2";
|
extension="tar.bz2";
|
||||||
url="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.${extension}";
|
url="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.${extension}";
|
||||||
hash="0pb148hb35p1c5iz0kpiclmswjl9bax9xfm087ldpxsqg9a0sb2q";
|
hash="0spl6afk8rm96ss4lh7zy5561m5m2qgwsnqjyp35jr1gyyrc944f";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
|
|
|
@ -1,58 +1,42 @@
|
||||||
x@{builderDefsPackage
|
{ stdenv, fetchurl
|
||||||
, freeglut, freealut, mesa, libICE, libjpeg, openal, openscenegraph, plib
|
, freeglut, freealut, mesa, libICE, libjpeg, openal, openscenegraph, plib
|
||||||
, libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto
|
, libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto
|
||||||
, libXmu, libXt, simgear, zlib, boost, cmake, libpng
|
, libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr
|
||||||
, ...}:
|
}:
|
||||||
builderDefsPackage
|
|
||||||
(a :
|
|
||||||
let
|
|
||||||
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
|
|
||||||
[];
|
|
||||||
|
|
||||||
buildInputs = map (n: builtins.getAttr n x)
|
stdenv.mkDerivation rec {
|
||||||
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
version = "2.12.0";
|
||||||
sourceInfo = rec {
|
name = "flightgear-${version}";
|
||||||
baseName="flightgear";
|
|
||||||
version="2.10.0";
|
src = fetchurl {
|
||||||
name="${baseName}-${version}";
|
url = "http://ftp.linux.kiev.ua/pub/fgfs/Source/${name}.tar.bz2";
|
||||||
extension="tar.bz2";
|
sha256 = "0h9ka4pa2njxbvy5jlmnsjy5ynzms504ygqn7hd80g3c58drsjc4";
|
||||||
url="http://ftp.linux.kiev.ua/pub/fgfs/Source/${name}.${extension}";
|
|
||||||
hash="0pq5nwyxwp8ar5rr0jh8p04bv0i9i841m374jwd748csnsn28zh6";
|
|
||||||
};
|
|
||||||
in
|
|
||||||
rec {
|
|
||||||
src = a.fetchurl {
|
|
||||||
url = sourceInfo.url;
|
|
||||||
sha256 = sourceInfo.hash;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
datasrc = a.fetchurl {
|
datasrc = fetchurl {
|
||||||
url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Shared/FlightGear-data-2.0.0.tar.bz2";
|
url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Shared/FlightGear-data-${version}.tar.bz";
|
||||||
sha256 = "0kvmvh5qycbpdjx12l20cbhljwimmcgww2dg4lkc2sky0kg14ic1";
|
sha256 = "0qjvcj2cz7ypa91v95lws44fg8c1p0pazv24ljkai2m2r0jgsv8k";
|
||||||
};
|
};
|
||||||
|
|
||||||
inherit (sourceInfo) name version;
|
buildInputs = [
|
||||||
inherit buildInputs;
|
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
|
||||||
|
];
|
||||||
|
|
||||||
/* doConfigure should be removed if not needed */
|
preConfigure = ''
|
||||||
phaseNames = ["doCmake" "doMakeInstall" "deployData"];
|
export cmakeFlagsArray=(-DFG_DATA_DIR="$out/share/FlightGear/")
|
||||||
|
'';
|
||||||
|
|
||||||
deployData = a.fullDepEntry ''
|
postInstall = ''
|
||||||
mkdir -p "$out/share/FlightGear"
|
mkdir -p "$out/share/FlightGear"
|
||||||
cd "$out/share/FlightGear"
|
tar xvf "${datasrc}" -C "$out/share/FlightGear/" --strip-components=1
|
||||||
tar xvf ${datasrc}
|
'';
|
||||||
'' ["minInit" "defEnsureDir"];
|
|
||||||
|
|
||||||
meta = {
|
meta = with stdenv.lib; {
|
||||||
description = "A flight simulator";
|
description = "Flight simulator";
|
||||||
maintainers = with a.lib.maintainers;
|
maintainers = with maintainers; [ raskin ];
|
||||||
[
|
#platforms = platforms.linux; # disabled from hydra because it's so big
|
||||||
raskin
|
license = licenses.gpl2;
|
||||||
];
|
|
||||||
#platforms = a.lib.platforms.linux;
|
|
||||||
license = a.lib.licenses.gpl2;
|
|
||||||
};
|
};
|
||||||
passthru = {
|
}
|
||||||
};
|
|
||||||
}) x
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue