Unverified Commit f97bd7fa authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #234899 from figsoda/pkg-config 

treewide: move pkg-config to nativeBuildInputs
parents 9f5ee707 c05fa242

pkgs/development/compilers/swift/sourcekit-lsp/default.nix

+3 −5
Original line number Diff line number Diff line 
{ lib

, stdenv

, callPackage

, pkg-config

, swift

, swiftpm

, swiftpm2nix

, Foundation

, XCTest

, pkg-config

, sqlite

, ncurses

, CryptoKit
@@ -28,15 +28,13 @@ stdenv.mkDerivation { 
  inherit (sources) version;

  src = sources.sourcekit-lsp;



  nativeBuildInputs = [ swift swiftpm ];

  nativeBuildInputs = [ pkg-config swift swiftpm ];

  buildInputs = [

    Foundation

    XCTest

    pkg-config

    sqlite

    ncursesInput

  ]

    ++ lib.optionals stdenv.isDarwin [ CryptoKit LocalAuthentication ];

  ] ++ lib.optionals stdenv.isDarwin [ CryptoKit LocalAuthentication ];



  configurePhase = generated.configure + ''

    swiftpmMakeMutable indexstore-db

pkgs/development/compilers/swift/swiftpm/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -365,12 +365,12 @@ in stdenv.mkDerivation (commonAttrs // { 
  pname = "swiftpm";



  nativeBuildInputs = commonAttrs.nativeBuildInputs ++ [

    pkg-config

    swift

    swiftpm-bootstrap

  ];

  buildInputs = [

    ncursesInput

    pkg-config

    sqlite

    XCTest

  ]