From 8733c5536edadccaf8086c863a31e9143fce0041 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 29 May 2023 19:51:01 -0400 Subject: [PATCH 1/2] swiftpm: move pkg-config to nativeBuildInputs --- pkgs/development/compilers/swift/swiftpm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix index b5abb8bf0336..e98d82d0d796 100644 --- a/pkgs/development/compilers/swift/swiftpm/default.nix +++ b/pkgs/development/compilers/swift/swiftpm/default.nix @@ -365,12 +365,12 @@ in stdenv.mkDerivation (commonAttrs // { pname = "swiftpm"; nativeBuildInputs = commonAttrs.nativeBuildInputs ++ [ + pkg-config swift swiftpm-bootstrap ]; buildInputs = [ ncursesInput - pkg-config sqlite XCTest ] From c05fa24286a9e8cc357155e3a14ac92421be556b Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 29 May 2023 19:52:22 -0400 Subject: [PATCH 2/2] sourcekit-lsp: move pkg-config to nativeBuildInputs --- .../development/compilers/swift/sourcekit-lsp/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix index d279fc400cb0..5cf928dc424b 100644 --- a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix +++ b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix @@ -1,12 +1,12 @@ { 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