From 76371b262f37b2edab3c889c5063b1d44f5839b4 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 4 Jan 2024 18:15:04 -0300 Subject: [PATCH 1/3] czkawka: refactor - move `darwin` inside the derivation - set strictDeps - remove nested with - add AndersonTorres to maintainers - set meta.mainProgram --- pkgs/tools/misc/czkawka/default.nix | 55 ++++++++++++++--------------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 28 insertions(+), 31 deletions(-) diff --git a/pkgs/tools/misc/czkawka/default.nix b/pkgs/tools/misc/czkawka/default.nix index 14908c0a402e..c86cb8be3c13 100644 --- a/pkgs/tools/misc/czkawka/default.nix +++ b/pkgs/tools/misc/czkawka/default.nix @@ -1,20 +1,20 @@ { lib , stdenv -, rustPlatform -, fetchFromGitHub -, pkg-config -, glib -, cairo -, pango -, gdk-pixbuf , atk -, gtk4 -, Foundation -, wrapGAppsHook4 -, gobject-introspection -, xvfb-run -, testers +, cairo , czkawka +, darwin +, fetchFromGitHub +, gdk-pixbuf +, glib +, gobject-introspection +, gtk4 +, pango +, pkg-config +, rustPlatform +, testers +, wrapGAppsHook4 +, xvfb-run }: rustPlatform.buildRustPackage rec { @@ -31,26 +31,28 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-iBO99kpITVl7ySlXPkEg2YecS1lonVx9CbKt9WI180s="; nativeBuildInputs = [ + gobject-introspection pkg-config wrapGAppsHook4 - gobject-introspection ]; buildInputs = [ - glib - cairo - pango - gdk-pixbuf atk + cairo + gdk-pixbuf + glib gtk4 + pango ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation + darwin.apple_sdk.frameworks.Foundation ]; nativeCheckInputs = [ xvfb-run ]; + strictDeps = true; + checkPhase = '' runHook preCheck xvfb-run cargo test @@ -65,23 +67,20 @@ rustPlatform.buildRustPackage rec { command = "czkawka_cli --version"; }; + # Desktop items, icons and metainfo are not installed automatically postInstall = '' - # Install Icons + install -Dm444 -t $out/share/applications data/com.github.qarmin.czkawka.desktop install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka.svg install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka-symbolic.svg - - # Install MetaInfo install -Dm444 -t $out/share/metainfo data/com.github.qarmin.czkawka.metainfo.xml - - # Install Desktop Entry - install -Dm444 -t $out/share/applications data/com.github.qarmin.czkawka.desktop ''; - meta = with lib; { + meta = { changelog = "https://github.com/qarmin/czkawka/raw/${version}/Changelog.md"; description = "A simple, fast and easy to use app to remove unnecessary files from your computer"; homepage = "https://github.com/qarmin/czkawka"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ yanganto _0x4A6F ]; + license = with lib.licenses; [ mit ]; + mainProgram = "czkawka_gui"; + maintainers = with lib.maintainers; [ AndersonTorres yanganto _0x4A6F ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a175ec31f19..21cef95a7a4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4780,9 +4780,7 @@ with pkgs; fw-ectool = callPackage ../os-specific/linux/fw-ectool { }; - czkawka = callPackage ../tools/misc/czkawka { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + czkawka = callPackage ../tools/misc/czkawka { }; chayang = callPackage ../tools/wayland/chayang { }; From abda4a0467b7ab97e6fe9e00087c671639a7558a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 4 Jan 2024 18:20:49 -0300 Subject: [PATCH 2/3] czkawka: get rid of rec By the polemical use of let block. --- pkgs/tools/misc/czkawka/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/czkawka/default.nix b/pkgs/tools/misc/czkawka/default.nix index c86cb8be3c13..f1f3fce9189a 100644 --- a/pkgs/tools/misc/czkawka/default.nix +++ b/pkgs/tools/misc/czkawka/default.nix @@ -17,7 +17,7 @@ , xvfb-run }: -rustPlatform.buildRustPackage rec { +let pname = "czkawka"; version = "6.1.0"; @@ -27,8 +27,10 @@ rustPlatform.buildRustPackage rec { rev = version; hash = "sha256-uKmiBNwuu3Eduf0v3p2VYYNf6mgxJTBUsYs+tKZQZys="; }; - cargoHash = "sha256-iBO99kpITVl7ySlXPkEg2YecS1lonVx9CbKt9WI180s="; +in +rustPlatform.buildRustPackage { + inherit pname version src cargoHash; nativeBuildInputs = [ gobject-introspection From 5c02ff85ce4dc22489c3f45e5de212c9981729d3 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 4 Jan 2024 18:22:49 -0300 Subject: [PATCH 3/3] czkawka: migrate to by-name --- .../misc/czkawka/default.nix => by-name/cz/czkawka/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/czkawka/default.nix => by-name/cz/czkawka/package.nix} (100%) diff --git a/pkgs/tools/misc/czkawka/default.nix b/pkgs/by-name/cz/czkawka/package.nix similarity index 100% rename from pkgs/tools/misc/czkawka/default.nix rename to pkgs/by-name/cz/czkawka/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21cef95a7a4c..af90957fff6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4780,8 +4780,6 @@ with pkgs; fw-ectool = callPackage ../os-specific/linux/fw-ectool { }; - czkawka = callPackage ../tools/misc/czkawka { }; - chayang = callPackage ../tools/wayland/chayang { }; cherrytree = callPackage ../applications/misc/cherrytree { };