BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #245655 from nvmd/sk/fix/czkawka

Browse source 
czkawka: fix build and check on darwin
This commit is contained in:
0x4A6F 2023-07-27 20:12:08 +02:00 committed by GitHub
commit f2facaf95d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/tools/misc/czkawka/default.nix
View file

@ -1,4 +1,5 @@
{ lib { lib
, stdenv
, rustPlatform , rustPlatform
, fetchFromGitHub , fetchFromGitHub
, pkg-config , pkg-config
@ -8,6 +9,7 @@
, gdk-pixbuf , gdk-pixbuf
, atk , atk
, gtk4 , gtk4
, Foundation
, wrapGAppsHook4 , wrapGAppsHook4
, gobject-introspection , gobject-introspection
, xvfb-run , xvfb-run
@ -41,6 +43,8 @@ rustPlatform.buildRustPackage rec {
gdk-pixbuf gdk-pixbuf
atk atk
gtk4 gtk4
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
Foundation
]; ];
nativeCheckInputs = [ nativeCheckInputs = [
@ -53,6 +57,9 @@ rustPlatform.buildRustPackage rec {
runHook postCheck runHook postCheck
''; '';
doCheck = stdenv.hostPlatform.isLinux
&& (stdenv.hostPlatform == stdenv.buildPlatform);
passthru.tests.version = testers.testVersion { passthru.tests.version = testers.testVersion {
package = czkawka; package = czkawka;
command = "czkawka_cli --version"; command = "czkawka_cli --version";

4
pkgs/top-level/all-packages.nix
View file

@ -4572,7 +4572,9 @@ with pkgs;
cowsay = callPackage ../tools/misc/cowsay { }; 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 { }; cherrytree = callPackage ../applications/misc/cherrytree { };