pyrox.dev / nixpkgs
lol
fork atom

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

kdash: fix Darwin build

authored by Bobby Rong and committed by GitHub f91da612 17ad9854

+8 -3
unified split
+5 -2
pkgs/development/tools/kdash/default.nix
··· 1 - { lib, stdenv 1 + { lib 2 + , stdenv 2 3 , fetchFromGitHub 3 4 , rustPlatform 4 5 , pkg-config ··· 6 7 , python3 7 8 , openssl 8 9 , xorg 10 + , AppKit 9 11 }: 10 12 11 13 rustPlatform.buildRustPackage rec { ··· 21 23 22 24 nativeBuildInputs = [ perl python3 pkg-config ]; 23 25 24 - buildInputs = [ openssl xorg.xcbutil ]; 26 + buildInputs = [ openssl xorg.xcbutil ] 27 + ++ lib.optional stdenv.isDarwin AppKit; 25 28 26 29 cargoSha256 = "0nb554y8r7gvw7ls6gnrg98xxbws0mc6zdsc6ss3p2x9z8xwx204"; 27 30
+3 -1
pkgs/top-level/all-packages.nix
··· 7397 7397 inherit (darwin.apple_sdk.frameworks) AppKit; 7398 7398 }; 7399 7399 7400 - kdash = callPackage ../development/tools/kdash { }; 7400 + kdash = callPackage ../development/tools/kdash { 7401 + inherit (darwin.apple_sdk.frameworks) AppKit; 7402 + }; 7401 7403 7402 7404 kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; 7403 7405