diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 41c51787d7e4..4470ccfec421 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -8,18 +8,25 @@ , python3 , makeWrapper +, backward-cpp +, curl +, enet +, freetype , glm +, gtest +, libbfd +, libdwarf +, libjpeg +, libuuid +, libuv , lua5_4 +, lzfse +, opencl-headers , SDL2 , SDL2_mixer -, enet -, libuv -, libuuid , wayland-protocols , Carbon , CoreServices -# optionals -, opencl-headers , OpenCL , callPackage @@ -28,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vengi-tools"; - version = "0.0.32"; + version = "0.0.33"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${finalAttrs.version}"; - hash = "sha256-3oL+hRFATdJmBmZK55Ui2blj8LTqt/zJWJ85kSUFCY4="; + hash = "sha256-ljB36A5b8K1KBBuQVISb1fkWxb/tTTwojE31KPMg1xQ="; }; nativeBuildInputs = [ @@ -46,32 +53,33 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + libbfd + libdwarf + backward-cpp + curl + enet + freetype glm + libjpeg + libuuid + libuv lua5_4 + lzfse SDL2 SDL2_mixer - enet - libuv - libuuid - # Only needed for the game - #postgresql - #libpqxx - #mosquitto ] ++ lib.optional stdenv.isLinux wayland-protocols ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices OpenCL ] ++ lib.optional (!stdenv.isDarwin) opencl-headers; - cmakeFlags = [ - # Disable tests due to a problem in linking gtest: - # ld: /build/vengi-tests-core.LDHlV1.ltrans0.ltrans.o: in function `main': - # :(.text.startup+0x3f): undefined reference to `testing::InitGoogleMock(int*, char**)' - "-DUNITTESTS=OFF" - "-DVISUALTESTS=OFF" - # We're only interested in the generic tools - "-DGAMES=OFF" - "-DMAPVIEW=OFF" - "-DAIDEBUG=OFF" - ] ++ lib.optional stdenv.isDarwin "-DCORESERVICES_LIB=${CoreServices}"; + cmakeFlags = + lib.optional stdenv.isDarwin "-DCORESERVICES_LIB=${CoreServices}"; + + # error: "The plain signature for target_link_libraries has already been used" + doCheck = false; + + checkInputs = [ + gtest + ]; # 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 @@ -105,5 +113,6 @@ stdenv.mkDerivation (finalAttrs: { license = [ licenses.mit licenses.cc-by-sa-30 ]; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + broken = stdenv.isDarwin; }; })