flightgear: 3.4.0 -> 2016.4.3.

This commit is contained in:
Moritz Ulrich 2016-12-24 22:57:25 +01:00
parent bc4a671980
commit bdc880e49d
No known key found for this signature in database
GPG key ID: 45833CACBC407FA7
2 changed files with 37 additions and 20 deletions

View file

@ -1,20 +1,22 @@
{ stdenv, fetchurl, plib, freeglut, xproto, libX11, libXext, xextproto, libXi { stdenv, fetchurl, plib, freeglut, xproto, libX11, libXext, xextproto, libXi
, inputproto, libICE, libSM, libXt, libXmu, mesa, boost, zlib, libjpeg, freealut , inputproto, libICE, libSM, libXt, libXmu, mesa, boost, zlib, libjpeg, freealut
, openscenegraph, openal, expat, cmake, apr , openscenegraph, openal, expat, cmake, apr
, curl
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "simgear-${version}"; name = "simgear-${version}";
version = "3.4.0"; version = "2016.4.3";
shortVersion = "2016.4";
src = fetchurl { src = fetchurl {
url = "http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.tar.bz2"; url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
sha256 = "152q3aqlrg3631ppvl6kr1mp5iszplq68l6lrsn9vjxafbz6czcj"; sha256 = "1gfj0d03jbi0p08baj46ihhyzbgpymmipw2dp11j13412l15acv9";
}; };
buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto buildInputs = [ 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 apr ]; openscenegraph openal expat cmake apr curl ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Simulation construction toolkit"; description = "Simulation construction toolkit";

View file

@ -1,22 +1,36 @@
{ stdenv, fetchurl { stdenv, fetchurl, makeWrapper
, 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, udev, fltk13, apr , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr
, makeDesktopItem, qtbase , makeDesktopItem, qtbase
}: }:
let
version = "2016.4.3";
shortVersion = "2016.4";
data = stdenv.mkDerivation rec {
name = "flightgear-base-${version}";
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2";
sha256 = "1wy4fg6r79a635rrjy2a2a6jkz2p5zzahxs0hz7scgxg4ikb5xp4";
};
phases = [ "installPhase" ];
installPhase = ''
mkdir -p "$out/share/FlightGear"
tar xf "${src}" -C "$out/share/FlightGear/" --strip-components=1
'';
};
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.4.0";
name = "flightgear-${version}"; name = "flightgear-${version}";
inherit version;
src = fetchurl { src = fetchurl {
url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Source/${name}.tar.bz2"; url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
sha256 = "102pg7mahgxzypvyp76x363qy3a4gxavr4hj16gsha07nl2msr5m"; sha256 = "08i8dlia3aral2wwf72n5q5ji4vxj51bnn24g6prqjjy4qww9a9m";
};
datasrc = fetchurl {
url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Shared/FlightGear-data-${version}.tar.bz2";
sha256 = "12qjvycizg693g5jj5qyp1jiwwywg6p9fg6j3zjxhx6r4g1sgvwc";
}; };
# Of all the files in the source and data archives, there doesn't seem to be # Of all the files in the source and data archives, there doesn't seem to be
@ -37,21 +51,22 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
makeWrapper
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 udev fltk13 apr qtbase libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qtbase
]; ];
preConfigure = ''
export cmakeFlagsArray=(-DFG_DATA_DIR="$out/share/FlightGear/")
'';
postInstall = '' postInstall = ''
mkdir -p "$out/share/applications/" mkdir -p "$out/share/applications/"
cp "${desktopItem}"/share/applications/* "$out/share/applications/" cp "${desktopItem}"/share/applications/* "$out/share/applications/" #*/
for f in $out/bin/* #*/
do
wrapProgram $f --set FG_ROOT "${data}/share/FlightGear"
done
mkdir -p "$out/share/FlightGear"
tar xvf "${datasrc}" -C "$out/share/FlightGear/" --strip-components=1
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {