From a56f200dd79260becf7220987b8c97845e971487 Mon Sep 17 00:00:00 2001 From: Yassine Date: Tue, 1 Oct 2024 23:58:14 +0300 Subject: [PATCH] edex-ui: formatting, remove `system` param, remove `with lib;` --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/by-name/ed/edex-ui/package.nix | 24 +++++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a2a689a9f61b..8875b4ead5e2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23142,6 +23142,12 @@ githubId = 33605526; name = "Yash Garg"; }; + yassinebenarbia = { + email = "yassine.bna@proton.me"; + github = "yassinebenarbia"; + githubId = 104306099; + name = "Yassine"; + }; yavko = { name = "Yavor Kolev"; email = "yavornkolev@gmail.com"; diff --git a/pkgs/by-name/ed/edex-ui/package.nix b/pkgs/by-name/ed/edex-ui/package.nix index c2b8dcbbc16b..7aac11e4c4f1 100644 --- a/pkgs/by-name/ed/edex-ui/package.nix +++ b/pkgs/by-name/ed/edex-ui/package.nix @@ -1,7 +1,11 @@ -{ appimageTools, fetchurl, system, lib }: -let +{ + appimageTools, + fetchurl, + lib, +}: +appimageTools.wrapType2 rec { pname = "edex-ui"; - name = "eDEX-UI"; + name = "eDEX-UI"; version = "2.2.8"; platform = "Linux-x86_64"; src = fetchurl { @@ -9,24 +13,22 @@ let hash = "sha256-yPKM1yHKAyygwZYLdWyj5k3EQaZDwy6vu3nGc7QC1oE="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; extraInstallCommands = '' install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/${pname}.png \ - $out/share/icons/hicolor/512x512/apps/${pname}.png + $out/share/icons/hicolor/512x512/apps/${pname}.png substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname} %U' + --replace 'Exec=AppRun' 'Exec=${pname} %U' ''; - meta = with lib; { + meta = { description = "A cross-platform, customizable science fiction terminal emulator with advanced monitoring & touchscreen support."; mainProgram = "edex-ui"; + changelog = "https://github.com/GitSquared/edex-ui/releases/tag${version}"; homepage = "https://github.com/GitSquared/edex-ui"; - license = licenses.gpl3; + license = lib.licenses.gpl3; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ yassinebenarbia ]; + maintainers = with lib.maintainers; [ yassinebenarbia ]; }; }