pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #234899 from figsoda/pkg-config

treewide: move pkg-config to nativeBuildInputs

authored by Nick Cao and committed by GitHub f97bd7fa 9f5ee707

+4 -6
unified split
+3 -5
pkgs/development/compilers/swift/sourcekit-lsp/default.nix
··· 1 { lib 2 , stdenv 3 , callPackage 4 , swift 5 , swiftpm 6 , swiftpm2nix 7 , Foundation 8 , XCTest 9 - , pkg-config 10 , sqlite 11 , ncurses 12 , CryptoKit ··· 28 inherit (sources) version; 29 src = sources.sourcekit-lsp; 30 31 - nativeBuildInputs = [ swift swiftpm ]; 32 buildInputs = [ 33 Foundation 34 XCTest 35 - pkg-config 36 sqlite 37 ncursesInput 38 - ] 39 - ++ lib.optionals stdenv.isDarwin [ CryptoKit LocalAuthentication ]; 40 41 configurePhase = generated.configure + '' 42 swiftpmMakeMutable indexstore-db
··· 1 { lib 2 , stdenv 3 , callPackage 4 + , pkg-config 5 , swift 6 , swiftpm 7 , swiftpm2nix 8 , Foundation 9 , XCTest 10 , sqlite 11 , ncurses 12 , CryptoKit ··· 28 inherit (sources) version; 29 src = sources.sourcekit-lsp; 30 31 + nativeBuildInputs = [ pkg-config swift swiftpm ]; 32 buildInputs = [ 33 Foundation 34 XCTest 35 sqlite 36 ncursesInput 37 + ] ++ lib.optionals stdenv.isDarwin [ CryptoKit LocalAuthentication ]; 38 39 configurePhase = generated.configure + '' 40 swiftpmMakeMutable indexstore-db
+1 -1
pkgs/development/compilers/swift/swiftpm/default.nix
··· 365 pname = "swiftpm"; 366 367 nativeBuildInputs = commonAttrs.nativeBuildInputs ++ [ 368 swift 369 swiftpm-bootstrap 370 ]; 371 buildInputs = [ 372 ncursesInput 373 - pkg-config 374 sqlite 375 XCTest 376 ]
··· 365 pname = "swiftpm"; 366 367 nativeBuildInputs = commonAttrs.nativeBuildInputs ++ [ 368 + pkg-config 369 swift 370 swiftpm-bootstrap 371 ]; 372 buildInputs = [ 373 ncursesInput 374 sqlite 375 XCTest 376 ]