diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-05-12 18:55:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-12 18:55:09 +0800 |
| commit | f91da6121a9008bcc2f64f166abf111abd78055e (patch) | |
| tree | cbdc8cdea2a752d3fd374bbdf3bff305aa24c4c2 | |
| parent | 17ad98545f8a17ed15c42aa81a9b9781cb5420db (diff) | |
| parent | 407b7c551c4e9014bd8d4303a97a544672440b2a (diff) | |
Merge pull request #172656 from tjni/kdash-darwin-fix
kdash: fix Darwin build
| -rw-r--r-- | pkgs/development/tools/kdash/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/tools/kdash/default.nix b/pkgs/development/tools/kdash/default.nix index 90bd304c87c30..daa07f1ceed62 100644 --- a/pkgs/development/tools/kdash/default.nix +++ b/pkgs/development/tools/kdash/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63f0bc9c9f779..1314ab4540147 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |