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 { };