Merge pull request #172656 from tjni/kdash-darwin-fix

kdash: fix Darwin build
This commit is contained in:
Bobby Rong
2022-05-12 18:55:09 +08:00
committed by GitHub
2 changed files with 8 additions and 3 deletions
+5 -2
View File
@@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, pkg-config
@@ -6,6 +7,7 @@
, python3
, openssl
, xorg
, AppKit
}:
rustPlatform.buildRustPackage rec {
@@ -21,7 +23,8 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ perl python3 pkg-config ];
buildInputs = [ openssl xorg.xcbutil ];
buildInputs = [ openssl xorg.xcbutil ]
++ lib.optional stdenv.isDarwin AppKit;
cargoSha256 = "0nb554y8r7gvw7ls6gnrg98xxbws0mc6zdsc6ss3p2x9z8xwx204";
+3 -1
View File
@@ -7397,7 +7397,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit;
};
kdash = callPackage ../development/tools/kdash { };
kdash = callPackage ../development/tools/kdash {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { };