dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #119763 from marius851000/fgfs

Browse Source 
flightgear, simgear: 2020.4.{4,6} -> 2020.4.8
This commit is contained in:
Michael Raskin 2021-04-21 06:22:28 +00:00 committed by GitHub
commit 8ddbcd14ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl, plib, freeglut, xorgproto, libX11, libXext, libXi
, libICE, libSM, libXt, libXmu, libGLU, libGL, boost, zlib, libjpeg, freealut
, openscenegraph, openal, expat, cmake, apr
, openscenegraph, openal, expat, cmake, apr, xz
, curl
}:
let
version = "2020.3.6";
version = "2020.3.8";
shortVersion = builtins.substring 0 6 version;
in
stdenv.mkDerivation rec {
@ -13,13 +13,13 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
sha256 = "sha256-7D7KRNIffgUr6vwbni1XwW+8GtXwM6vJZ7V6/QLDVmk=";
sha256 = "sha256-UXcWV9MPu7c+QlFjrhxtQ6ruAcxuKtewwphu4tt5dWc=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ plib freeglut xorgproto libX11 libXext libXi
libICE libSM libXt libXmu libGLU libGL boost zlib libjpeg freealut
openscenegraph openal expat apr curl ];
openscenegraph openal expat apr curl xz ];
meta = with lib; {
description = "Simulation construction toolkit";

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

@ -6,15 +6,15 @@
}:
let
version = "2020.3.4";
version = "2020.3.8";
shortVersion = builtins.substring 0 6 version;
data = stdenv.mkDerivation rec {
pname = "flightgear-data";
inherit version;
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2";
sha256 = "1cqikbqvidfaynml9bhqfr9yw5ga35gpqrbz62z94a1skdijkpkg";
url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.txz";
sha256 = "sha256-/KFumHRkmRvsU/L1i11jG/KbqobnOEP7l4lyPMKHycA=";
};
phases = [ "installPhase" ];
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
sha256 = "02d9h10p8hyn0a25csragj6pbwmrir1z8zb92023s9vi21j7bwy8";
sha256 = "XXDqhZ9nR+FwQ3LauZe8iGxOjlyDXDrEtj61BQGVDYc=";
};
# Of all the files in the source and data archives, there doesn't seem to be