diff options
| author | Luna Nova <git@lunnova.dev> | 2022-05-28 12:38:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-28 21:38:00 +0200 |
| commit | 793f99c48e3a6d6b47e88deb20ff6171e7971977 (patch) | |
| tree | 68429a846abf9e24fc1778f1776368aee36cca2d /pkgs/applications/graphics | |
| parent | a9ebc8175190b741a1b1b10296504e86dabfce40 (diff) | |
monado: 21.0.0 -> unstable-2022-05-28 (#173907)
* 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>
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/monado/default.nix | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index 0280664279511..41a2487a85258 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , writeText , cmake , doxygen @@ -46,25 +45,16 @@ stdenv.mkDerivation rec { pname = "monado"; - version = "21.0.0"; + version = "unstable-2022-05-28"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "07zxs96i3prjqww1f68496cl2xxqaidx32lpfyy0pn5am4c297zc"; + owner = "monado"; + repo = "monado"; + rev = "011bcbdcff227e25507e5f2d81a83a2bbe478856"; + 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 = [ cmake doxygen @@ -130,5 +120,6 @@ stdenv.mkDerivation rec { license = licenses.boost; maintainers = with maintainers; [ expipiplus1 prusnak ]; platforms = platforms.linux; + mainProgram = "monado-cli"; }; } |