From 3f42dcce7d305e29b7a6bbbb71734937140cfe65 Mon Sep 17 00:00:00 2001 From: Sergey Kazenyuk Date: Thu, 27 Jul 2023 07:00:06 +0300 Subject: [PATCH] czkawka: fix build and check on darwin --- pkgs/tools/misc/czkawka/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/czkawka/default.nix b/pkgs/tools/misc/czkawka/default.nix index 408e5b9f7bf9..6506101908d0 100644 --- a/pkgs/tools/misc/czkawka/default.nix +++ b/pkgs/tools/misc/czkawka/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , pkg-config @@ -8,6 +9,7 @@ , gdk-pixbuf , atk , gtk4 +, Foundation , wrapGAppsHook4 , gobject-introspection , xvfb-run @@ -41,6 +43,8 @@ rustPlatform.buildRustPackage rec { gdk-pixbuf atk gtk4 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Foundation ]; nativeCheckInputs = [ @@ -53,6 +57,9 @@ rustPlatform.buildRustPackage rec { runHook postCheck ''; + doCheck = stdenv.hostPlatform.isLinux + && (stdenv.hostPlatform == stdenv.buildPlatform); + passthru.tests.version = testers.testVersion { package = czkawka; command = "czkawka_cli --version"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba142c1e461a..c953b29e4bed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4566,7 +4566,9 @@ with pkgs; cowsay = callPackage ../tools/misc/cowsay { }; - czkawka = callPackage ../tools/misc/czkawka { }; + czkawka = callPackage ../tools/misc/czkawka { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; cherrytree = callPackage ../applications/misc/cherrytree { };