From 62cf92008ac514c93406ea8fd48d2efe79e4779b Mon Sep 17 00:00:00 2001 From: Roman Lubij Date: Sun, 1 Feb 2026 12:56:42 +0100 Subject: [PATCH] Use krokiet instead of czkawka --- flake.lock | 31 +++++++++--------- flake.nix | 1 + flakes/czkawka-master/flake.nix | 56 ++++++++++++++++++++------------- modules/packages.nix | 1 + 4 files changed, 52 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 47a883d..0b63b75 100644 --- a/flake.lock +++ b/flake.lock @@ -19,16 +19,15 @@ "czkawka-src": { "flake": false, "locked": { - "lastModified": 1742109806, - "narHash": "sha256-ePiHDfQ1QC3nff8uWE0ggiTuulBomuoZ3ta0redUYXY=", + "lastModified": 1769933380, + "narHash": "sha256-Gu1cg0d5aXBc+jYikLjvBwMzCgy+349KqQjVrzTe2pE=", "owner": "qarmin", "repo": "czkawka", - "rev": "5dc8d38cfef639b71e74468a284677b5ec9f97bf", + "rev": "ba45d0f5299e0460f9410d3192f81bbb8a2b5826", "type": "github" }, "original": { "owner": "qarmin", - "ref": "9.0.0", "repo": "czkawka", "type": "github" } @@ -83,11 +82,11 @@ ] }, "locked": { - "lastModified": 1768908532, - "narHash": "sha256-HIdLXEFaUVE8FiaCPJbCfBMsnF+mVtDub8Jwj2BD+mk=", + "lastModified": 1769799857, + "narHash": "sha256-88IFXZ7Sa1vxbz5pty0Io5qEaMQMMUPMonLa3Ls/ss4=", "owner": "nix-community", "repo": "naersk", - "rev": "8d97452673640eb7fabe428e8b6a425bc355008b", + "rev": "9d4ed44d8b8cecdceb1d6fd76e74123d90ae6339", "type": "github" }, "original": { @@ -113,11 +112,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -129,11 +128,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1769170000, - "narHash": "sha256-6oPLzApeqyasaTOXVFVlAG1egake5j7SUAbHNn3xOhk=", + "lastModified": 1769900851, + "narHash": "sha256-RgCgXS3WiG9c/1wxFM6OXmmv39dSaLLON9VeAbTTAIM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff1238ae9265ebacb8e1341e658d839bdf5fac8b", + "rev": "30a3e96da641620c63f2e1f345ea434ac78f5de1", "type": "github" }, "original": { @@ -145,11 +144,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8918d8e..180673a 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ nix-flatpak.url = "github:gmodena/nix-flatpak"; czkawka-master.url = "path:./flakes/czkawka-master"; + # czkawka-git.url = "github:qarmin/czkawka?dir=misc/nix"; solaar-master.url = "path:./flakes/solaar-master"; }; diff --git a/flakes/czkawka-master/flake.nix b/flakes/czkawka-master/flake.nix index 58e4fb7..d6cedf1 100644 --- a/flakes/czkawka-master/flake.nix +++ b/flakes/czkawka-master/flake.nix @@ -1,15 +1,12 @@ { - description = "Czkawka (Master) - Built with Naersk"; + description = "Krokiet (Czkawka Slint GUI)"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - czkawka-src = { - url = "github:qarmin/czkawka/9.0.0"; + url = "github:qarmin/czkawka"; flake = false; }; - - # Naersk: Builds Rust crates without needing a manual cargoHash naersk = { url = "github:nix-community/naersk"; inputs.nixpkgs.follows = "nixpkgs"; @@ -30,39 +27,56 @@ nativeBuildInputs = with pkgs; [ pkg-config - wrapGAppsHook4 - gobject-introspection + cmake + makeWrapper cargo rustc ]; - buildInputs = with pkgs; [ - glib - gtk4 - cairo - pango - gdk-pixbuf - atk - libadwaita + runtimeLibs = with pkgs; [ + wayland + libxkbcommon + libglvnd + fontconfig + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr ]; in { packages.${system}.default = naersk-lib.buildPackage { - pname = "czkawka"; + pname = "krokiet"; version = "master"; src = czkawka-src; - inherit nativeBuildInputs buildInputs; + nativeBuildInputs = nativeBuildInputs; + buildInputs = runtimeLibs; + + cargoBuildOptions = + x: + x + ++ [ + "-p" + "krokiet" + ]; + + buildAndCheckFeatures = [ + "winit_wayland" + "winit_x11" + ]; RUSTFLAGS = "-C target-cpu=native"; NIX_CFLAGS_COMPILE = "-march=native -mtune=native"; postInstall = '' - 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 -Dm444 -t $out/share/metainfo data/com.github.qarmin.czkawka.metainfo.xml + wrapProgram $out/bin/krokiet \ + --prefix LD_LIBRARY_PATH : ${pkgs.lib.makeLibraryPath runtimeLibs} + + install -Dm444 -t $out/share/applications data/io.github.qarmin.czkawka.krokiet.desktop + install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/io.github.qarmin.czkawka.krokiet.svg + install -Dm444 -t $out/share/metainfo data/io.github.qarmin.czkawka.krokiet.metainfo.xml ''; }; }; diff --git a/modules/packages.nix b/modules/packages.nix index f8d195c..91b5c74 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -61,6 +61,7 @@ curl # czkawka czkawka-master.packages.${pkgs.stdenv.hostPlatform.system}.default + # czkawka-git.packages.${pkgs.stdenv.hostPlatform.system}.czkawka-gui-wayland ddcutil discord distrobox