Merge pull request #7 from LordGrimmauld/master

align nix tooling with post-review tooling merged upstream
This commit is contained in:
Andrew Scott 2024-04-03 11:39:01 -07:00 committed by GitHub
commit 1de4531c3a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,42 +1,20 @@
{ cargo { fetchFromGitHub
, fetchFromGitHub
, glib , glib
, gnused
, gtk3 , gtk3
, lib , lib
, libsoup_3 , libsoup_3
, networkmanager , networkmanager
, pkg-config , pkg-config
, rustPlatform , rustPlatform
, rustc
, stdenv
, webkitgtk_4_1 , webkitgtk_4_1
, wrapGAppsHook , wrapGAppsHook
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
version = "1.1.0";
pname = "rmenu"; pname = "rmenu";
version = "1.2.0";
src = lib.cleanSource ../.; src = lib.cleanSource ../.;
# src = fetchFromGitHub {
# rev = "188f542"; # "v${version}";
# owner = "imgurbot12";
# repo = pname;
# hash = "sha256-IRwYxjyHdP6794pQjyyUmofO8uakMY22pqdFkJZ5Mdo=";
# };
strictDeps = true;
cargoLock = {
lockFile = ../Cargo.lock;
outputHashes = {
"gio-0.19.0" = "sha256-+PAQNJ9sTk8aKAhA/PLQWDCKDT/cQ+ukdbem7g1J+pU=";
"nm-0.4.0" = "sha256-53ipJU10ZhIKIF7PCw5Eo/e/reUK0qpyTyE7uIrCD88=";
};
};
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
wrapGAppsHook wrapGAppsHook
@ -48,9 +26,19 @@ rustPlatform.buildRustPackage rec {
libsoup_3 libsoup_3
networkmanager networkmanager
webkitgtk_4_1 webkitgtk_4_1
gnused
]; ];
strictDeps = true;
cargoLock = {
lockFile = ../Cargo.lock;
outputHashes = {
"gio-0.19.0" = "sha256-+PAQNJ9sTk8aKAhA/PLQWDCKDT/cQ+ukdbem7g1J+pU=";
"nm-0.4.0" = "sha256-53ipJU10ZhIKIF7PCw5Eo/e/reUK0qpyTyE7uIrCD88=";
};
};
postInstall = '' postInstall = ''
# copy themes and plugins # copy themes and plugins
mkdir $out/themes mkdir $out/themes
@ -71,21 +59,27 @@ rustPlatform.buildRustPackage rec {
mv $out/plugins/window $out/plugins/rmenu-window mv $out/plugins/window $out/plugins/rmenu-window
# fix config and theme # fix config and theme
mkdir -p $out/etc/xdg/rmenu mkdir -p $out/share/rmenu
cp -vf $src/rmenu/public/config.yaml $out/etc/xdg/rmenu/config.yaml cp -vf $src/rmenu/public/config.yaml $out/share/rmenu/config.yaml
sed -i "s@~\/\.config\/rmenu\/themes@$out\/themes@g" $out/etc/xdg/rmenu/config.yaml sed -i "s@~\/\.config\/rmenu\/themes@$out\/themes@g" $out/share/rmenu/config.yaml
sed -i "s@~\/\.config\/rmenu@$out\/plugins@g" $out/etc/xdg/rmenu/config.yaml sed -i "s@~\/\.config\/rmenu@$out\/plugins@g" $out/share/rmenu/config.yaml
ln -sf $out/themes/dark.css $out/etc/xdg/rmenu/style.css ln -sf $out/themes/dark.css $out/share/rmenu/style.css
''; '';
doCheck = true; preFixup = ''
gappsWrapperArgs+=(
--suffix XDG_CONFIG_DIRS : "$out/share"
)
'';
meta = with lib; {
changelog = "https://github.com/imgurbot12/rmenu/commits/master/"; meta = {
description = "Another customizable Application-Launcher written in Rust "; changelog = "https://github.com/imgurbot12/rmenu/releases/tag/v${version}";
description = "Another customizable Application-Launcher written in Rust";
homepage = "https://github.com/imgurbot12/rmenu"; homepage = "https://github.com/imgurbot12/rmenu";
license = lib.licenses.mit;
mainProgram = "rmenu"; mainProgram = "rmenu";
maintainers = [ maintainers.grimmauld ]; maintainers = with lib.maintainers; [ grimmauld ];
platforms = platforms.linux; platforms = lib.platforms.linux;
}; };
} }