naev: 0.11.5 -> 0.12.5 (#405748)
This commit is contained in:
@@ -1,9 +1,14 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
unzip,
|
||||
pkg-config,
|
||||
python3,
|
||||
SDL2,
|
||||
SDL2_image,
|
||||
enet,
|
||||
fetchFromGitHub,
|
||||
freetype,
|
||||
glpk,
|
||||
intltool,
|
||||
@@ -19,21 +24,39 @@
|
||||
openblas,
|
||||
pcre2,
|
||||
physfs,
|
||||
pkg-config,
|
||||
python3,
|
||||
stdenv,
|
||||
suitesparse,
|
||||
libyaml,
|
||||
cmark,
|
||||
dbus,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
lyaml = fetchFromGitHub {
|
||||
owner = "gvvaughan";
|
||||
repo = "lyaml";
|
||||
tag = "v6.2.8";
|
||||
hash = "sha256-ADLXi38sAs9ifQ4HJoYzgdp/dw0axGmVCtqJjpqWcmQ=";
|
||||
};
|
||||
nativefiledialog-extended = fetchFromGitHub {
|
||||
owner = "btzy";
|
||||
repo = "nativefiledialog-extended";
|
||||
tag = "v1.2.1";
|
||||
hash = "sha256-GwT42lMZAAKSJpUJE6MYOpSLKUD5o9nSe9lcsoeXgJY=";
|
||||
};
|
||||
nativefiledialog-extended-patch = fetchurl {
|
||||
url = "https://wrapdb.mesonbuild.com/v2/nativefiledialog-extended_1.2.1-1/get_patch";
|
||||
hash = "sha256-BEouiB2HTVWokrYc9VOqdnjRwPBs+us5obQ/NMqXawk=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "naev";
|
||||
version = "0.11.5";
|
||||
version = "0.12.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "naev";
|
||||
repo = "naev";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vdPkACgLGSTb9E/HZR5KoXn/fro0iHV7hX9kJim1j/M=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-I+OU3sr+C8HPnJTQ+Cc/EvshzawqikoMg3cp9uQ5dSQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -54,6 +77,9 @@ stdenv.mkDerivation rec {
|
||||
pcre2
|
||||
physfs
|
||||
suitesparse
|
||||
libyaml
|
||||
cmark
|
||||
dbus
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -67,6 +93,7 @@ stdenv.mkDerivation rec {
|
||||
ninja
|
||||
pkg-config
|
||||
intltool
|
||||
unzip
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
@@ -76,13 +103,21 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --build dat/outfits/bioship/generate.py utils/build/*.py utils/*.py
|
||||
patchShebangs --build dat/outfits/bioship/generate.py utils/build/*.py utils/*.py dat/naevpedia/ships/ships.py dat/naevpedia/outfits/outfits.py
|
||||
|
||||
# Add a missing include to fix the build against luajit-2.1.1741730670.
|
||||
# Otherwise the build fails as:
|
||||
# src/lutf8lib.c:421:22: error: 'INT_MAX' undeclared (first use in this function)
|
||||
# TODO: drop after 0.12.3 release
|
||||
sed -i '1i#include <limits.h>' src/lutf8lib.c
|
||||
cp -r ${lyaml} subprojects/lyaml-6.2.8
|
||||
chmod -R +w subprojects/lyaml-6.2.8
|
||||
cp -r subprojects/packagefiles/lyaml/* subprojects/lyaml-6.2.8
|
||||
cp -r ${nativefiledialog-extended} subprojects/nativefiledialog-extended-1.2.1
|
||||
chmod -R +w subprojects/nativefiledialog-extended-1.2.1
|
||||
tmp=$(mktemp -d)
|
||||
unzip ${nativefiledialog-extended-patch} -d $tmp
|
||||
cp -r $tmp/*/* subprojects/nativefiledialog-extended-1.2.1
|
||||
'';
|
||||
|
||||
meta = {
|
||||
@@ -93,4 +128,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with lib.maintainers; [ ralismark ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user