pyrox.dev
lol
flightgear: 2020.3.19 -> 2024.1.1 (#386331)
+22
-17
+7
-6
pkgs/by-name/si/simgear/package.nix
+7
-6
pkgs/by-name/si/simgear/package.nix
···
1
1
{
2
2
lib,
3
3
stdenv,
4
-
fetchurl,
4
+
fetchFromGitLab,
5
5
plib,
6
6
libglut,
7
7
xorgproto,
···
27
27
curl,
28
28
}:
29
29
let
30
-
version = "2020.3.19";
31
-
shortVersion = builtins.substring 0 6 version;
30
+
version = "2024.1.1";
32
31
in
33
32
stdenv.mkDerivation rec {
34
33
pname = "simgear";
35
34
inherit version;
36
35
37
-
src = fetchurl {
38
-
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
39
-
sha256 = "sha256-O5N8W5RCJHjl15EUvc1seOQ6Cm/7qXVEqG1EHD+ejDo=";
36
+
src = fetchFromGitLab {
37
+
owner = "flightgear";
38
+
repo = "simgear";
39
+
tag = "v${version}";
40
+
hash = "sha256-hOA/q/cTsqRy82rTAXRxyHBDdw93TW9UL+K5Jq5b/08=";
40
41
};
41
42
42
43
nativeBuildInputs = [ cmake ];
+15
-11
pkgs/games/flightgear/default.nix
+15
-11
pkgs/games/flightgear/default.nix
···
1
1
{
2
2
lib,
3
3
stdenv,
4
-
fetchurl,
4
+
fetchFromGitLab,
5
5
wrapQtAppsHook,
6
6
libglut,
7
7
freealut,
···
28
28
udev,
29
29
fltk13,
30
30
apr,
31
-
makeDesktopItem,
32
31
qtbase,
32
+
qtquickcontrols2,
33
33
qtdeclarative,
34
34
glew,
35
35
curl,
36
36
}:
37
37
38
38
let
39
-
version = "2020.3.19";
40
-
shortVersion = builtins.substring 0 6 version;
39
+
version = "2024.1.1";
41
40
data = stdenv.mkDerivation rec {
42
41
pname = "flightgear-data";
43
42
inherit version;
44
43
45
-
src = fetchurl {
46
-
url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.txz";
47
-
sha256 = "sha256-863EnNBU+rYTdxHwMV6HbBu99lO6H3mKGuyumm6YR5U=";
44
+
src = fetchFromGitLab {
45
+
owner = "flightgear";
46
+
repo = "fgdata";
47
+
tag = "v${version}";
48
+
hash = "sha256-PdqsIZw9mSrvnqqB/fVFjWPW9njhXLWR/2LQCMoBLQI=";
48
49
};
49
50
50
51
dontUnpack = true;
51
52
52
53
installPhase = ''
53
54
mkdir -p "$out/share/FlightGear"
54
-
tar xf "${src}" -C "$out/share/FlightGear/" --strip-components=1
55
+
cp ${src}/* -a "$out/share/FlightGear/"
55
56
'';
56
57
};
57
58
in
···
60
61
# inheriting data for `nix-prefetch-url -A pkgs.flightgear.data.src`
61
62
inherit version data;
62
63
63
-
src = fetchurl {
64
-
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
65
-
sha256 = "sha256-Fn0I3pzA9yIYs3myPNflbH9u4Y19VZUS2lGjvWfzjm4=";
64
+
src = fetchFromGitLab {
65
+
owner = "flightgear";
66
+
repo = "flightgear";
67
+
tag = "v${version}";
68
+
hash = "sha256-h4N18VAbJGQSBKA+eEQxej5e5MEwAcZpvH+dpTypM+k=";
66
69
};
67
70
68
71
nativeBuildInputs = [
···
95
98
fltk13
96
99
apr
97
100
qtbase
101
+
qtquickcontrols2
98
102
glew
99
103
qtdeclarative
100
104
curl