flightgear: fix build via update; but no testing, hope it works
This commit is contained in:
parent
871c9ff726
commit
82a0df8bad
|
@ -1,23 +1,23 @@
|
||||||
x@{builderDefsPackage
|
x@{builderDefsPackage
|
||||||
, 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
|
, libXmu, libXt, simgear, zlib, boost, cmake, libpng
|
||||||
, ...}:
|
, ...}:
|
||||||
builderDefsPackage
|
builderDefsPackage
|
||||||
(a :
|
(a :
|
||||||
let
|
let
|
||||||
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
|
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
|
||||||
[];
|
[];
|
||||||
|
|
||||||
buildInputs = map (n: builtins.getAttr n x)
|
buildInputs = map (n: builtins.getAttr n x)
|
||||||
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
||||||
sourceInfo = rec {
|
sourceInfo = rec {
|
||||||
baseName="FlightGear";
|
baseName="flightgear";
|
||||||
version="2.0.0";
|
version="2.10.0";
|
||||||
name="${baseName}-${version}";
|
name="${baseName}-${version}";
|
||||||
extension="tar.gz";
|
extension="tar.bz2";
|
||||||
url="http://ftp.linux.kiev.ua/pub/fgfs/Source/${name}.${extension}";
|
url="http://ftp.linux.kiev.ua/pub/fgfs/Source/${name}.${extension}";
|
||||||
hash="17h7ns955xkd0cakfk22aym0id65rd8kylcamkmycbgnnhs4b1wg";
|
hash="0pq5nwyxwp8ar5rr0jh8p04bv0i9i841m374jwd748csnsn28zh6";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
|
@ -35,14 +35,14 @@ rec {
|
||||||
inherit buildInputs;
|
inherit buildInputs;
|
||||||
|
|
||||||
/* doConfigure should be removed if not needed */
|
/* doConfigure should be removed if not needed */
|
||||||
phaseNames = ["doConfigure" "doMakeInstall" "deployData"];
|
phaseNames = ["doCmake" "doMakeInstall" "deployData"];
|
||||||
|
|
||||||
deployData = a.fullDepEntry ''
|
deployData = a.fullDepEntry ''
|
||||||
mkdir -p "$out/share/FlightGear"
|
mkdir -p "$out/share/FlightGear"
|
||||||
cd "$out/share/FlightGear"
|
cd "$out/share/FlightGear"
|
||||||
tar xvf ${datasrc}
|
tar xvf ${datasrc}
|
||||||
'' ["minInit" "defEnsureDir"];
|
'' ["minInit" "defEnsureDir"];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "A flight simulator";
|
description = "A flight simulator";
|
||||||
maintainers = with a.lib.maintainers;
|
maintainers = with a.lib.maintainers;
|
||||||
|
|
|
@ -8122,7 +8122,7 @@ let
|
||||||
libpng = libpng12;
|
libpng = libpng12;
|
||||||
};
|
};
|
||||||
|
|
||||||
flightgear = callPackage ../games/flightgear {};
|
flightgear = callPackage ../games/flightgear { };
|
||||||
|
|
||||||
freeciv = callPackage ../games/freeciv { };
|
freeciv = callPackage ../games/freeciv { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue