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