cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

monado: 21.0.0 -> unstable-2022-05-28 (#173907)

Browse source 
* monado: 21.0.0 -> unstable-2022-05-28

Upstream hasn't had a version bump in 1.5 years, lots of progress since then.

monado: Apply suggestions from @SuperSandro2000's review

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

* monado: set mainProgram to monado-cli

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Luna Nova 2022-05-28 12:38:00 -07:00 committed by GitHub
parent a9ebc81751
commit 793f99c48e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/applications/graphics/monado/default.nix
View file

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitLab , fetchFromGitLab
, fetchpatch
, writeText , writeText
, cmake , cmake
, doxygen , doxygen
@ -46,25 +45,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "monado"; pname = "monado";
version = "21.0.0"; version = "unstable-2022-05-28";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.freedesktop.org"; domain = "gitlab.freedesktop.org";
owner = pname; owner = "monado";
repo = pname; repo = "monado";
rev = "v${version}"; rev = "011bcbdcff227e25507e5f2d81a83a2bbe478856";
sha256 = "07zxs96i3prjqww1f68496cl2xxqaidx32lpfyy0pn5am4c297zc"; sha256 = "sha256-8velNKSCZJtKO8ATwXDl1nU8RbxZ8TeyGiUQFOXifuI=";
}; };
patches = [
# https://github.com/NixOS/nixpkgs/issues/137245
# Fix warning after Vulkan 1.2.174 VK_NULL_HANDLE change
(fetchpatch {
url = "https://gitlab.freedesktop.org/monado/monado/-/commit/c47775a95d8e139a2f234063793eb6726f830510.patch";
sha256 = "093ymvi9ifpk4vyjcwhhci9cnscxwbv5f80xdbppcqa0j92nmkmp";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
doxygen doxygen
@ -130,5 +120,6 @@ stdenv.mkDerivation rec {
license = licenses.boost; license = licenses.boost;
maintainers = with maintainers; [ expipiplus1 prusnak ]; maintainers = with maintainers; [ expipiplus1 prusnak ];
platforms = platforms.linux; platforms = platforms.linux;
mainProgram = "monado-cli";
}; };
} }