vengi-tools: 0.0.32 -> 0.0.33
This commit is contained in:
parent
f940d69b27
commit
c879f27429
@ -8,18 +8,25 @@
|
|||||||
, python3
|
, python3
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
|
|
||||||
|
, backward-cpp
|
||||||
|
, curl
|
||||||
|
, enet
|
||||||
|
, freetype
|
||||||
, glm
|
, glm
|
||||||
|
, gtest
|
||||||
|
, libbfd
|
||||||
|
, libdwarf
|
||||||
|
, libjpeg
|
||||||
|
, libuuid
|
||||||
|
, libuv
|
||||||
, lua5_4
|
, lua5_4
|
||||||
|
, lzfse
|
||||||
|
, opencl-headers
|
||||||
, SDL2
|
, SDL2
|
||||||
, SDL2_mixer
|
, SDL2_mixer
|
||||||
, enet
|
|
||||||
, libuv
|
|
||||||
, libuuid
|
|
||||||
, wayland-protocols
|
, wayland-protocols
|
||||||
, Carbon
|
, Carbon
|
||||||
, CoreServices
|
, CoreServices
|
||||||
# optionals
|
|
||||||
, opencl-headers
|
|
||||||
, OpenCL
|
, OpenCL
|
||||||
|
|
||||||
, callPackage
|
, callPackage
|
||||||
@ -28,13 +35,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "vengi-tools";
|
pname = "vengi-tools";
|
||||||
version = "0.0.32";
|
version = "0.0.33";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mgerhardy";
|
owner = "mgerhardy";
|
||||||
repo = "vengi";
|
repo = "vengi";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-3oL+hRFATdJmBmZK55Ui2blj8LTqt/zJWJ85kSUFCY4=";
|
hash = "sha256-ljB36A5b8K1KBBuQVISb1fkWxb/tTTwojE31KPMg1xQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@ -46,32 +53,33 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
libbfd
|
||||||
|
libdwarf
|
||||||
|
backward-cpp
|
||||||
|
curl
|
||||||
|
enet
|
||||||
|
freetype
|
||||||
glm
|
glm
|
||||||
|
libjpeg
|
||||||
|
libuuid
|
||||||
|
libuv
|
||||||
lua5_4
|
lua5_4
|
||||||
|
lzfse
|
||||||
SDL2
|
SDL2
|
||||||
SDL2_mixer
|
SDL2_mixer
|
||||||
enet
|
|
||||||
libuv
|
|
||||||
libuuid
|
|
||||||
# Only needed for the game
|
|
||||||
#postgresql
|
|
||||||
#libpqxx
|
|
||||||
#mosquitto
|
|
||||||
] ++ lib.optional stdenv.isLinux wayland-protocols
|
] ++ lib.optional stdenv.isLinux wayland-protocols
|
||||||
++ lib.optionals stdenv.isDarwin [ Carbon CoreServices OpenCL ]
|
++ lib.optionals stdenv.isDarwin [ Carbon CoreServices OpenCL ]
|
||||||
++ lib.optional (!stdenv.isDarwin) opencl-headers;
|
++ lib.optional (!stdenv.isDarwin) opencl-headers;
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags =
|
||||||
# Disable tests due to a problem in linking gtest:
|
lib.optional stdenv.isDarwin "-DCORESERVICES_LIB=${CoreServices}";
|
||||||
# ld: /build/vengi-tests-core.LDHlV1.ltrans0.ltrans.o: in function `main':
|
|
||||||
# <artificial>:(.text.startup+0x3f): undefined reference to `testing::InitGoogleMock(int*, char**)'
|
# error: "The plain signature for target_link_libraries has already been used"
|
||||||
"-DUNITTESTS=OFF"
|
doCheck = false;
|
||||||
"-DVISUALTESTS=OFF"
|
|
||||||
# We're only interested in the generic tools
|
checkInputs = [
|
||||||
"-DGAMES=OFF"
|
gtest
|
||||||
"-DMAPVIEW=OFF"
|
];
|
||||||
"-DAIDEBUG=OFF"
|
|
||||||
] ++ lib.optional stdenv.isDarwin "-DCORESERVICES_LIB=${CoreServices}";
|
|
||||||
|
|
||||||
# Set the data directory for each executable. We cannot set it at build time
|
# Set the data directory for each executable. We cannot set it at build time
|
||||||
# with the PKGDATADIR cmake variable because each executable needs a specific
|
# with the PKGDATADIR cmake variable because each executable needs a specific
|
||||||
@ -105,5 +113,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
license = [ licenses.mit licenses.cc-by-sa-30 ];
|
license = [ licenses.mit licenses.cc-by-sa-30 ];
|
||||||
maintainers = with maintainers; [ fgaz ];
|
maintainers = with maintainers; [ fgaz ];
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
|
broken = stdenv.isDarwin;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user