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
This commit is contained in:
Atemu 2024-01-16 16:39:54 +01:00
parent 9b19f5e77d
commit 500cd68bb1
2 changed files with 31 additions and 13 deletions

View File

@ -1,28 +1,48 @@
{ lib, stdenv, fetchgit, bash-completion, cmake, pkg-config
, json_c, libdrm, libpciaccess, llvmPackages, nanomsg, ncurses, SDL2
{ lib
, stdenv
, fetchFromGitLab
, cmake
, pkg-config
, libdrm
, mesa # libgbm
, libpciaccess
, llvmPackages
, nanomsg
, ncurses
, SDL2
, bash-completion
}:
stdenv.mkDerivation rec {
pname = "umr";
version = "unstable-2022-08-23";
version = "1.0.8";
src = fetchgit {
url = "https://gitlab.freedesktop.org/tomstdenis/umr";
rev = "87f814b1ffdbac8bfddd8529d344a7901cd7e112";
hash = "sha256-U1VP1AicSGWzBwzz99i7+3awATZocw5jaqtAxuRNaBE=";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "tomstdenis";
repo = "umr";
rev = version;
hash = "sha256-ODkTYHDrKWNvjiEeIyfsCByf7hyr5Ps9ytbKb3253bU=";
};
nativeBuildInputs = [ cmake pkg-config llvmPackages.llvm.dev ];
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
bash-completion
json_c
libdrm
mesa
libpciaccess
llvmPackages.llvm
nanomsg
ncurses
SDL2
bash-completion # Tries to create bash-completions in /var/empty otherwise?
];
# Remove static libraries (there are no dynamic libraries in there)

View File

@ -18203,9 +18203,7 @@ with pkgs;
publii = callPackage ../development/web/publii {};
umr = callPackage ../development/misc/umr {
llvmPackages = llvmPackages_14;
};
umr = callPackage ../development/misc/umr { };
refurb = callPackage ../development/tools/refurb { };