lol

umr: unstable-2022-08-23 -> 1.0.8

Fixes the build and uses a stable version

Also switched to the gitlab fetcher, did a bit of cleanup and fixed umrgui

Atemu 500cd68b 9b19f5e7

+31 -13
+30 -10
pkgs/development/misc/umr/default.nix
··· 1 - { lib, stdenv, fetchgit, bash-completion, cmake, pkg-config 2 - , json_c, libdrm, libpciaccess, llvmPackages, nanomsg, ncurses, SDL2 1 + { lib 2 + , stdenv 3 + 4 + , fetchFromGitLab 5 + 6 + , cmake 7 + , pkg-config 8 + 9 + , libdrm 10 + , mesa # libgbm 11 + , libpciaccess 12 + , llvmPackages 13 + , nanomsg 14 + , ncurses 15 + , SDL2 16 + , bash-completion 3 17 }: 4 18 5 19 stdenv.mkDerivation rec { 6 20 pname = "umr"; 7 - version = "unstable-2022-08-23"; 21 + version = "1.0.8"; 8 22 9 - src = fetchgit { 10 - url = "https://gitlab.freedesktop.org/tomstdenis/umr"; 11 - rev = "87f814b1ffdbac8bfddd8529d344a7901cd7e112"; 12 - hash = "sha256-U1VP1AicSGWzBwzz99i7+3awATZocw5jaqtAxuRNaBE="; 23 + src = fetchFromGitLab { 24 + domain = "gitlab.freedesktop.org"; 25 + owner = "tomstdenis"; 26 + repo = "umr"; 27 + rev = version; 28 + hash = "sha256-ODkTYHDrKWNvjiEeIyfsCByf7hyr5Ps9ytbKb3253bU="; 13 29 }; 14 30 15 - nativeBuildInputs = [ cmake pkg-config llvmPackages.llvm.dev ]; 31 + nativeBuildInputs = [ 32 + cmake 33 + pkg-config 34 + ]; 16 35 17 36 buildInputs = [ 18 - bash-completion 19 - json_c 20 37 libdrm 38 + mesa 21 39 libpciaccess 22 40 llvmPackages.llvm 23 41 nanomsg 24 42 ncurses 25 43 SDL2 44 + 45 + bash-completion # Tries to create bash-completions in /var/empty otherwise? 26 46 ]; 27 47 28 48 # Remove static libraries (there are no dynamic libraries in there)
+1 -3
pkgs/top-level/all-packages.nix
··· 18203 18203 18204 18204 publii = callPackage ../development/web/publii {}; 18205 18205 18206 - umr = callPackage ../development/misc/umr { 18207 - llvmPackages = llvmPackages_14; 18208 - }; 18206 + umr = callPackage ../development/misc/umr { }; 18209 18207 18210 18208 refurb = callPackage ../development/tools/refurb { }; 18211 18209