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

kdash: fix Darwin build
main
Bobby Rong 2 years ago committed by GitHub
commit f91da6121a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      pkgs/development/tools/kdash/default.nix
  2. 4
      pkgs/top-level/all-packages.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";

@ -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 { };

Loading…
Cancel
Save