colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #59236 from aanderse/flightgear

Browse Source 
flightgear & simgear: 2018.2.2 -> 2018.3.1
This commit is contained in:
Michael Raskin 2019-04-10 09:29:01 +00:00 committed by GitHub
commit cd2a342249
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/simgear/default.nix
View File

@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
name = "simgear-${version}";
version = "2018.2.2";
shortVersion = "2018.2";
version = "2018.3.1";
shortVersion = "2018.3";
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
sha256 = "f61576bc36aae36f350154749df1cee396763604c06b8a71c4b50452d9151ce5";
sha256 = "0sm0v8v1sw5xzkzhf0gzh6fwx93hd62h5lm9s9hgci40x7480i99";
};
buildInputs = [ plib freeglut xorgproto libX11 libXext libXi

8
pkgs/games/flightgear/default.nix
View File

@ -6,14 +6,14 @@
}:
let
version = "2018.2.2";
shortVersion = "2018.2";
version = "2018.3.1";
shortVersion = "2018.3";
data = stdenv.mkDerivation rec {
name = "flightgear-base-${version}";
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2";
sha256 = "c89b94e4cf3cb7eda728daf6cca6dd051f7a47863776c99fd2f3fe0054400ac4";
sha256 = "1h69ifj84l4k0f497ybk51xj3bprzw4xvwrwzzj708zhkjk78fmh";
};
phases = [ "installPhase" ];
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
sha256 = "61f809ef0a3f6908d156f0c483ed5313d31b5a6ac74761955d0b266751718147";
sha256 = "0h56npn00b6fd38cf5cha82nnglxmhd12b7h2rn3gjymwhviyjix";
};
# Of all the files in the source and data archives, there doesn't seem to be