mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-03-06 23:31:34 +00:00
flightgear & simgear: Bump to 3.0.0.
This commit is contained in:
parent
3e7f8bce62
commit
57e0371f12
pkgs
|
@ -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.12.1";
|
version="3.0.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="0w8drzglgp01019frx96062qcigzfflsyq59f8shpwmzjb2hzli4";
|
hash="05l0wvi0s4a98ihmjbpcc66rj6qy3hrsqkjs388bddf2ws3qyi09";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
|
|
|
@ -6,17 +6,17 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "2.12.1";
|
version = "3.0.0";
|
||||||
name = "flightgear-${version}";
|
name = "flightgear-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://ftp.linux.kiev.ua/pub/fgfs/Source/${name}.tar.bz2";
|
url = "http://ftp.linux.kiev.ua/pub/fgfs/Source/${name}.tar.bz2";
|
||||||
sha256 = "1wj0a9k9pq404lylmv7v5f05vmrqd8fwj61kr78vldf44n44gixw";
|
sha256 = "1sd6ic9rrcgrqvc6ywkasj2pnmmmdv1i2rlyac2a882rh8i1kgz4";
|
||||||
};
|
};
|
||||||
|
|
||||||
datasrc = fetchurl {
|
datasrc = fetchurl {
|
||||||
url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Shared/FlightGear-${version}-data.tar.bz2";
|
url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Shared/FlightGear-data-${version}.tar.bz2";
|
||||||
sha256 = "0hlsvzz12pyzw3mb4xsv4iwblrbf7d27mdprll64kr7p1h9qlmkl";
|
sha256 = "0mq5hkh8zgm129mg1ij3rrk7h2xs9ijxa7d7hipjlp6mcyhlk0q4";
|
||||||
};
|
};
|
||||||
|
|
||||||
# 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
|
||||||
|
@ -47,11 +47,11 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
mkdir -p "$out/share/FlightGear"
|
|
||||||
tar xvf "${datasrc}" -C "$out/share/FlightGear/" --strip-components=1
|
|
||||||
|
|
||||||
mkdir -p "$out/share/applications/"
|
mkdir -p "$out/share/applications/"
|
||||||
cp "${desktopItem}"/share/applications/* "$out/share/applications/"
|
cp "${desktopItem}"/share/applications/* "$out/share/applications/"
|
||||||
|
|
||||||
|
mkdir -p "$out/share/FlightGear"
|
||||||
|
tar xvf "${datasrc}" -C "$out/share/FlightGear/" --strip-components=1
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|
Loading…
Reference in a new issue