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

Merge pull request #318203 from Scrumplex/pkgs/monado/unstable-update-1

Browse Source 
monado: unstable-2024-01-02 -> 24.0.0
This commit is contained in:
Weijia Wang 2024-07-03 14:20:54 +02:00 committed by GitHub
commit cd43d05d95
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/applications/graphics/monado/default.nix → pkgs/by-name/mo/monado/package.nix
View File

@ -9,7 +9,6 @@
, doxygen
, eigen
, elfutils
, ffmpeg
, glslang
, gst-plugins-base
, gstreamer
@ -31,6 +30,7 @@
, libXdmcp
, libXext
, libXrandr
, nix-update-script
, onnxruntime
, opencv4
, openhmd
@ -51,23 +51,23 @@
, zlib
, zstd
, nixosTests
# Set as 'false' to build monado without service support, i.e. allow VR
# applications linking against libopenxr_monado.so to use OpenXR standalone
# instead of via the monado-service program. For more information see:
# https://gitlab.freedesktop.org/monado/monado/-/blob/master/doc/targets.md#xrt_feature_service-disabled
# Set as 'false' to build monado without service support, i.e. allow VR
# applications linking against libopenxr_monado.so to use OpenXR standalone
# instead of via the monado-service program. For more information see:
# https://gitlab.freedesktop.org/monado/monado/-/blob/master/doc/targets.md#xrt_feature_service-disabled
, serviceSupport ? true
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "monado";
version = "unstable-2024-01-02";
version = "24.0.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "monado";
repo = "monado";
rev = "bfa1c16ff9fc759327ca251a5d086b958b1a3b8a";
hash = "sha256-wXRwOs9MkDre/VeW686DzmvKjX0qCSS13MILbYQD6OY=";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-lFy0VvaLD4Oyu2TZJnaIWjuaJUZjGGDJS0VsRfIUpcc=";
};
nativeBuildInputs = [
@ -92,7 +92,6 @@ stdenv.mkDerivation {
dbus
eigen
elfutils
ffmpeg
gst-plugins-base
gstreamer
hidapi
@ -143,8 +142,9 @@ stdenv.mkDerivation {
export XDG_CONFIG_DIRS=@out@/etc/xdg''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}}
'';
passthru.tests = {
basic-service = nixosTests.monado;
passthru = {
updateScript = nix-update-script { };
tests.basic-service = nixosTests.monado;
};
meta = with lib; {
@ -155,4 +155,4 @@ stdenv.mkDerivation {
platforms = platforms.linux;
mainProgram = "monado-cli";
};
}
})

2
pkgs/top-level/all-packages.nix
View File

@ -5818,7 +5818,7 @@ with pkgs;
monetdb = callPackage ../servers/sql/monetdb { };
monado = callPackage ../applications/graphics/monado {
monado = callPackage ../by-name/mo/monado/package.nix {
inherit (gst_all_1) gstreamer gst-plugins-base;
};