commit dcb0eaf66d3ad5f1826a8c6b629b6cb3afb42603 · pyrox.dev/nixpkgs

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

···

       186
       186
        
           gnugrep_bin = gnugrep;

     

       187
       187
        
           suffixSalt = lib.replaceStrings ["-" "."] ["_" "_"] targetPlatform.config;

     

       188
       188
        
           use_response_file_by_default = 1;

     

       189
       189
       +
           swiftDriver = "";

     

       189
       190
        
           # NOTE: @prog@ needs to be filled elsewhere.

     

       190
       191
        
         };

     

       191
       192
        
         swiftWrapper = runCommand "swift-wrapper.sh" wrapperParams ''

+14 -3

pkgs/development/compilers/swift/default.nix

···

       53
       53
        
             inherit (apple_sdk.frameworks) CoreServices Foundation Combine;

     

       54
       54
        
           };

     

       55
       55
        
       

     

       56
       56
       -
           swift = callPackage ./wrapper {

     

       56
       56
       +
           swiftNoSwiftDriver = callPackage ./wrapper {

     

       57
       57
        
             swift = swift-unwrapped;

     

       58
       58
       +
             useSwiftDriver = false;

     

       58
       59
        
           };

     

       59
       60
        
       

     

       60
       61
        
           Dispatch = if stdenv.isDarwin

     

       61
       62
        
             then null # part of libsystem

     

       62
       62
       -
             else callPackage ./libdispatch { };

     

       63
       63
       +
             else callPackage ./libdispatch { swift = swiftNoSwiftDriver; };

     

       63
       64
        
       

     

       64
       65
        
           Foundation = if stdenv.isDarwin

     

       65
       66
        
             then apple_sdk.frameworks.Foundation

     

       66
       66
       -
             else callPackage ./foundation { };

     

       67
       67
       +
             else callPackage ./foundation { swift = swiftNoSwiftDriver; };

     

       67
       68
        
       

     

       68
       69
        
           # TODO: Apple distributes a binary XCTest with Xcode, but it is not part of

     

       69
       70
        
           # CLTools (or SUS), so would have to figure out how to fetch it. The binary

     

       70
       71
        
           # version has several extra features, like a test runner and ObjC support.

     

       71
       72
        
           XCTest = callPackage ./xctest {

     

       72
       73
        
             inherit (darwin) DarwinTools;

     

       74
       74
       +
             swift = swiftNoSwiftDriver;

     

       73
       75
        
           };

     

       74
       76
        
       

     

       75
       77
        
           swiftpm = callPackage ./swiftpm {

     

       76
       78
        
             inherit (darwin) DarwinTools cctools;

     

       77
       79
        
             inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication;

     

       80
       80
       +
             swift = swiftNoSwiftDriver;

     

       81
       81
       +
           };

     

       82
       82
       +
       

     

       83
       83
       +
           swift-driver = callPackage ./swift-driver {

     

       84
       84
       +
             swift = swiftNoSwiftDriver;

     

       85
       85
       +
           };

     

       86
       86
       +
       

     

       87
       87
       +
           swift = callPackage ./wrapper {

     

       88
       88
       +
             swift = swift-unwrapped;

     

       78
       89
        
           };

     

       79
       90
        
       

     

       80
       91
        
         };

+83

pkgs/development/compilers/swift/swift-driver/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , callPackage

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , fetchpatch

     

       6
       6
       +
       , swift

     

       7
       7
       +
       , swiftpm

     

       8
       8
       +
       , Foundation

     

       9
       9
       +
       , XCTest

     

       10
       10
       +
       , sqlite

     

       11
       11
       +
       , ncurses

     

       12
       12
       +
       , substituteAll

     

       13
       13
       +
       }:

     

       14
       14
       +
       let

     

       15
       15
       +
         # Generated by swiftpm2nix.

     

       16
       16
       +
         generated = callPackage ./generated { };

     

       17
       17
       +
       

     

       18
       18
       +
         # On Darwin, we only want ncurses in the linker search path, because headers

     

       19
       19
       +
         # are part of libsystem. Adding its headers to the search path causes strange

     

       20
       20
       +
         # mixing and errors.

     

       21
       21
       +
         # TODO: Find a better way to prevent this conflict.

     

       22
       22
       +
         ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses;

     

       23
       23
       +
       in

     

       24
       24
       +
       stdenv.mkDerivation rec {

     

       25
       25
       +
         pname = "swift-driver";

     

       26
       26
       +
       

     

       27
       27
       +
         # Releases are made as part of the Swift toolchain, so versions should match.

     

       28
       28
       +
         version = "5.7";

     

       29
       29
       +
         src = fetchFromGitHub {

     

       30
       30
       +
           owner = "apple";

     

       31
       31
       +
           repo = "swift-driver";

     

       32
       32
       +
           rev = "swift-${version}-RELEASE";

     

       33
       33
       +
           hash = "sha256-sk7XWXYR1MGPEeVxA6eA/vxhN6Gq16iD1RHpVstL3zE=";

     

       34
       34
       +
         };

     

       35
       35
       +
       

     

       36
       36
       +
         nativeBuildInputs = [ swift swiftpm ];

     

       37
       37
       +
         buildInputs = [

     

       38
       38
       +
           Foundation

     

       39
       39
       +
           XCTest

     

       40
       40
       +
           sqlite

     

       41
       41
       +
           ncursesInput

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         patches = [

     

       45
       45
       +
           ./patches/nix-resource-root.patch

     

       46
       46
       +
           ./patches/disable-catalyst.patch

     

       47
       47
       +
           ./patches/linux-fix-linking.patch

     

       48
       48
       +
           # TODO: Replace with branch patch once merged:

     

       49
       49
       +
           # https://github.com/apple/swift-driver/pull/1197

     

       50
       50
       +
           (fetchpatch {

     

       51
       51
       +
             url = "https://github.com/apple/swift-driver/commit/d3ef9cdf4871a58eddec7ff0e28fe611130da3f9.patch";

     

       52
       52
       +
             hash = "sha256-eVBaKN6uzj48ZnHtwGV0k5ChKjak1tDCyE+wTdyGq2c=";

     

       53
       53
       +
           })

     

       54
       54
       +
           # Prevent a warning about SDK directories we don't have.

     

       55
       55
       +
           (substituteAll {

     

       56
       56
       +
             src = ./patches/prevent-sdk-dirs-warnings.patch;

     

       57
       57
       +
             inherit (builtins) storeDir;

     

       58
       58
       +
           })

     

       59
       59
       +
         ];

     

       60
       60
       +
       

     

       61
       61
       +
         configurePhase = generated.configure;

     

       62
       62
       +
       

     

       63
       63
       +
         # TODO: Tests depend on indexstore-db being provided by an existing Swift

     

       64
       64
       +
         # toolchain. (ie. looks for `../lib/libIndexStore.so` relative to swiftc.

     

       65
       65
       +
         #doCheck = true;

     

       66
       66
       +
       

     

       67
       67
       +
         # TODO: Darwin-specific installation includes more, but not sure why.

     

       68
       68
       +
         installPhase = ''

     

       69
       69
       +
           binPath="$(swiftpmBinPath)"

     

       70
       70
       +
           mkdir -p $out/bin

     

       71
       71
       +
           for executable in swift-driver swift-help swift-build-sdk-interfaces; do

     

       72
       72
       +
             cp $binPath/$executable $out/bin/

     

       73
       73
       +
           done

     

       74
       74
       +
         '';

     

       75
       75
       +
       

     

       76
       76
       +
         meta = {

     

       77
       77
       +
           description = "Swift compiler driver";

     

       78
       78
       +
           homepage = "https://github.com/apple/swift-driver";

     

       79
       79
       +
           platforms = with lib.platforms; linux ++ darwin;

     

       80
       80
       +
           license = lib.licenses.asl20;

     

       81
       81
       +
           maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ];

     

       82
       82
       +
         };

     

       83
       83
       +
       }

+52

pkgs/development/compilers/swift/swift-driver/generated/Package.resolved

···

       1
       1
       +
       {

     

       2
       2
       +
         "object": {

     

       3
       3
       +
           "pins": [

     

       4
       4
       +
             {

     

       5
       5
       +
               "package": "swift-argument-parser",

     

       6
       6
       +
               "repositoryURL": "https://github.com/apple/swift-argument-parser.git",

     

       7
       7
       +
               "state": {

     

       8
       8
       +
                 "branch": null,

     

       9
       9
       +
                 "revision": "e1465042f195f374b94f915ba8ca49de24300a0d",

     

       10
       10
       +
                 "version": "1.0.2"

     

       11
       11
       +
               }

     

       12
       12
       +
             },

     

       13
       13
       +
             {

     

       14
       14
       +
               "package": "llbuild",

     

       15
       15
       +
               "repositoryURL": "https://github.com/apple/swift-llbuild.git",

     

       16
       16
       +
               "state": {

     

       17
       17
       +
                 "branch": "release/5.7",

     

       18
       18
       +
                 "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b",

     

       19
       19
       +
                 "version": null

     

       20
       20
       +
               }

     

       21
       21
       +
             },

     

       22
       22
       +
             {

     

       23
       23
       +
               "package": "swift-system",

     

       24
       24
       +
               "repositoryURL": "https://github.com/apple/swift-system.git",

     

       25
       25
       +
               "state": {

     

       26
       26
       +
                 "branch": null,

     

       27
       27
       +
                 "revision": "836bc4557b74fe6d2660218d56e3ce96aff76574",

     

       28
       28
       +
                 "version": "1.1.1"

     

       29
       29
       +
               }

     

       30
       30
       +
             },

     

       31
       31
       +
             {

     

       32
       32
       +
               "package": "swift-tools-support-core",

     

       33
       33
       +
               "repositoryURL": "https://github.com/apple/swift-tools-support-core.git",

     

       34
       34
       +
               "state": {

     

       35
       35
       +
                 "branch": "release/5.7",

     

       36
       36
       +
                 "revision": "184eba382f6abbb362ffc02942d790ff35019ad4",

     

       37
       37
       +
                 "version": null

     

       38
       38
       +
               }

     

       39
       39
       +
             },

     

       40
       40
       +
             {

     

       41
       41
       +
               "package": "Yams",

     

       42
       42
       +
               "repositoryURL": "https://github.com/jpsim/Yams.git",

     

       43
       43
       +
               "state": {

     

       44
       44
       +
                 "branch": null,

     

       45
       45
       +
                 "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa",

     

       46
       46
       +
                 "version": "4.0.6"

     

       47
       47
       +
               }

     

       48
       48
       +
             }

     

       49
       49
       +
           ]

     

       50
       50
       +
         },

     

       51
       51
       +
         "version": 1

     

       52
       52
       +
       }

+47

pkgs/development/compilers/swift/swift-driver/generated/default.nix

···

       1
       1
       +
       # This file was generated by swiftpm2nix.

     

       2
       2
       +
       { lib, fetchgit }: rec {

     

       3
       3
       +
         sources = {

     

       4
       4
       +
           "swift-argument-parser" = fetchgit {

     

       5
       5
       +
             url = "https://github.com/apple/swift-argument-parser.git";

     

       6
       6
       +
             rev = "e1465042f195f374b94f915ba8ca49de24300a0d";

     

       7
       7
       +
             sha256 = "11did5snqj8chcbdbiyx84mpif940ls2pr1iikwivvfp63i248hm";

     

       8
       8
       +
           };

     

       9
       9
       +
           "swift-llbuild" = fetchgit {

     

       10
       10
       +
             url = "https://github.com/apple/swift-llbuild.git";

     

       11
       11
       +
             rev = "564424db5fdb62dcb5d863bdf7212500ef03a87b";

     

       12
       12
       +
             sha256 = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h";

     

       13
       13
       +
           };

     

       14
       14
       +
           "swift-system" = fetchgit {

     

       15
       15
       +
             url = "https://github.com/apple/swift-system.git";

     

       16
       16
       +
             rev = "836bc4557b74fe6d2660218d56e3ce96aff76574";

     

       17
       17
       +
             sha256 = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7";

     

       18
       18
       +
           };

     

       19
       19
       +
           "swift-tools-support-core" = fetchgit {

     

       20
       20
       +
             url = "https://github.com/apple/swift-tools-support-core.git";

     

       21
       21
       +
             rev = "184eba382f6abbb362ffc02942d790ff35019ad4";

     

       22
       22
       +
             sha256 = "005akmisnkcg6zjwm545183c12xm8z504yxxqmnqf0rakfcab1mi";

     

       23
       23
       +
           };

     

       24
       24
       +
           "Yams" = fetchgit {

     

       25
       25
       +
             url = "https://github.com/jpsim/Yams.git";

     

       26
       26
       +
             rev = "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa";

     

       27
       27
       +
             sha256 = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45";

     

       28
       28
       +
           };

     

       29
       29
       +
         };

     

       30
       30
       +
         configure = ''

     

       31
       31
       +
           mkdir -p .build/checkouts

     

       32
       32
       +
           ln -sf ${./Package.resolved} ./Package.resolved

     

       33
       33
       +
           install -m 0600 ${./workspace-state.json} ./.build/workspace-state.json

     

       34
       34
       +
         ''

     

       35
       35
       +
           + lib.concatStrings (lib.mapAttrsToList (name: src: ''

     

       36
       36
       +
             ln -s '${src}' '.build/checkouts/${name}'

     

       37
       37
       +
           '') sources)

     

       38
       38
       +
           + ''

     

       39
       39
       +
             # Helper that makes a swiftpm dependency mutable by copying the source.

     

       40
       40
       +
             swiftpmMakeMutable() {

     

       41
       41
       +
               local orig="$(readlink .build/checkouts/$1)"

     

       42
       42
       +
               rm .build/checkouts/$1

     

       43
       43
       +
               cp -r "$orig" .build/checkouts/$1

     

       44
       44
       +
               chmod -R u+w .build/checkouts/$1

     

       45
       45
       +
             }

     

       46
       46
       +
           '';

     

       47
       47
       +
       }

+93

pkgs/development/compilers/swift/swift-driver/generated/workspace-state.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "object": {

     

       3
       3
       +
           "artifacts": [],

     

       4
       4
       +
           "dependencies": [

     

       5
       5
       +
             {

     

       6
       6
       +
               "basedOn": null,

     

       7
       7
       +
               "packageRef": {

     

       8
       8
       +
                 "identity": "swift-argument-parser",

     

       9
       9
       +
                 "kind": "remoteSourceControl",

     

       10
       10
       +
                 "location": "https://github.com/apple/swift-argument-parser.git",

     

       11
       11
       +
                 "name": "swift-argument-parser"

     

       12
       12
       +
               },

     

       13
       13
       +
               "state": {

     

       14
       14
       +
                 "checkoutState": {

     

       15
       15
       +
                   "revision": "e1465042f195f374b94f915ba8ca49de24300a0d",

     

       16
       16
       +
                   "version": "1.0.2"

     

       17
       17
       +
                 },

     

       18
       18
       +
                 "name": "sourceControlCheckout"

     

       19
       19
       +
               },

     

       20
       20
       +
               "subpath": "swift-argument-parser"

     

       21
       21
       +
             },

     

       22
       22
       +
             {

     

       23
       23
       +
               "basedOn": null,

     

       24
       24
       +
               "packageRef": {

     

       25
       25
       +
                 "identity": "swift-llbuild",

     

       26
       26
       +
                 "kind": "remoteSourceControl",

     

       27
       27
       +
                 "location": "https://github.com/apple/swift-llbuild.git",

     

       28
       28
       +
                 "name": "llbuild"

     

       29
       29
       +
               },

     

       30
       30
       +
               "state": {

     

       31
       31
       +
                 "checkoutState": {

     

       32
       32
       +
                   "branch": "release/5.7",

     

       33
       33
       +
                   "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b"

     

       34
       34
       +
                 },

     

       35
       35
       +
                 "name": "sourceControlCheckout"

     

       36
       36
       +
               },

     

       37
       37
       +
               "subpath": "swift-llbuild"

     

       38
       38
       +
             },

     

       39
       39
       +
             {

     

       40
       40
       +
               "basedOn": null,

     

       41
       41
       +
               "packageRef": {

     

       42
       42
       +
                 "identity": "swift-system",

     

       43
       43
       +
                 "kind": "remoteSourceControl",

     

       44
       44
       +
                 "location": "https://github.com/apple/swift-system.git",

     

       45
       45
       +
                 "name": "swift-system"

     

       46
       46
       +
               },

     

       47
       47
       +
               "state": {

     

       48
       48
       +
                 "checkoutState": {

     

       49
       49
       +
                   "revision": "836bc4557b74fe6d2660218d56e3ce96aff76574",

     

       50
       50
       +
                   "version": "1.1.1"

     

       51
       51
       +
                 },

     

       52
       52
       +
                 "name": "sourceControlCheckout"

     

       53
       53
       +
               },

     

       54
       54
       +
               "subpath": "swift-system"

     

       55
       55
       +
             },

     

       56
       56
       +
             {

     

       57
       57
       +
               "basedOn": null,

     

       58
       58
       +
               "packageRef": {

     

       59
       59
       +
                 "identity": "swift-tools-support-core",

     

       60
       60
       +
                 "kind": "remoteSourceControl",

     

       61
       61
       +
                 "location": "https://github.com/apple/swift-tools-support-core.git",

     

       62
       62
       +
                 "name": "swift-tools-support-core"

     

       63
       63
       +
               },

     

       64
       64
       +
               "state": {

     

       65
       65
       +
                 "checkoutState": {

     

       66
       66
       +
                   "branch": "release/5.7",

     

       67
       67
       +
                   "revision": "184eba382f6abbb362ffc02942d790ff35019ad4"

     

       68
       68
       +
                 },

     

       69
       69
       +
                 "name": "sourceControlCheckout"

     

       70
       70
       +
               },

     

       71
       71
       +
               "subpath": "swift-tools-support-core"

     

       72
       72
       +
             },

     

       73
       73
       +
             {

     

       74
       74
       +
               "basedOn": null,

     

       75
       75
       +
               "packageRef": {

     

       76
       76
       +
                 "identity": "yams",

     

       77
       77
       +
                 "kind": "remoteSourceControl",

     

       78
       78
       +
                 "location": "https://github.com/jpsim/Yams.git",

     

       79
       79
       +
                 "name": "Yams"

     

       80
       80
       +
               },

     

       81
       81
       +
               "state": {

     

       82
       82
       +
                 "checkoutState": {

     

       83
       83
       +
                   "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa",

     

       84
       84
       +
                   "version": "4.0.6"

     

       85
       85
       +
                 },

     

       86
       86
       +
                 "name": "sourceControlCheckout"

     

       87
       87
       +
               },

     

       88
       88
       +
               "subpath": "Yams"

     

       89
       89
       +
             }

     

       90
       90
       +
           ]

     

       91
       91
       +
         },

     

       92
       92
       +
         "version": 5

     

       93
       93
       +
       }

+17

pkgs/development/compilers/swift/swift-driver/patches/disable-catalyst.patch

···

       1
       1
       +
       Tries to parse SDKSettings.plist looking for a Catalyst version map, but we

     

       2
       2
       +
       don't currently support this.

     

       3
       3
       +
       

     

       4
       4
       +
       --- a/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift

     

       5
       5
       +
       +++ b/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift

     

       6
       6
       +
       @@ -297,11 +297,7 @@ public final class DarwinToolchain: Toolchain {

     

       7
       7
       +
                                                       debugDescription: "Malformed version string")

     

       8
       8
       +
              }

     

       9
       9
       +
              self.version = version

     

       10
       10
       +
       -      if self.canonicalName.hasPrefix("macosx") {

     

       11
       11
       +
       -        self.versionMap = try keyedContainer.decode(VersionMap.self, forKey: .versionMap)

     

       12
       12
       +
       -      } else {

     

       13
       13
       +
                self.versionMap = VersionMap()

     

       14
       14
       +
       -      }

     

       15
       15
       +
            }

     

       16
       16
       +
        

     

       17
       17
       +

+40

pkgs/development/compilers/swift/swift-driver/patches/linux-fix-linking.patch

···

       1
       1
       +
       --- a/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift

     

       2
       2
       +
       +++ b/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift

     

       3
       3
       +
       @@ -9,6 +9,7 @@

     

       4
       4
       +
        // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

     

       5
       5
       +
        //

     

       6
       6
       +
        //===----------------------------------------------------------------------===//

     

       7
       7
       +
       +import Foundation

     

       8
       8
       +
        import TSCBasic

     

       9
       9
       +
        import SwiftOptions

     

       10
       10
       +
        

     

       11
       11
       +
       @@ -116,7 +117,20 @@ extension GenericUnixToolchain {

     

       12
       12
       +
              // just using `clang` and avoid a dependency on the C++ runtime.

     

       13
       13
       +
              let clangTool: Tool =

     

       14
       14
       +
                parsedOptions.hasArgument(.enableExperimentalCxxInterop) ? .clangxx : .clang

     

       15
       15
       +
       -      var clangPath = try getToolPath(clangTool)

     

       16
       16
       +
       +

     

       17
       17
       +
       +      // For Nix, prefer linking using the wrapped system clang, instead of using

     

       18
       18
       +
       +      // the unwrapped clang packaged with swift. The latter is unable to link, but

     

       19
       19
       +
       +      // we still want to use it for other purposes (clang importer).

     

       20
       20
       +
       +      var clangPath: AbsolutePath

     

       21
       21
       +
       +      let env = ProcessInfo.processInfo.environment

     

       22
       22
       +
       +      if let nixCC = env["NIX_CC"],

     

       23
       23
       +
       +         let binPath = try? AbsolutePath(validating: "\(nixCC)/bin"),

     

       24
       24
       +
       +         let tool = lookupExecutablePath(filename: parsedOptions.hasArgument(.enableExperimentalCxxInterop)

     

       25
       25
       +
       +                                                        ? "clang++" : "clang",

     

       26
       26
       +
       +                                         searchPaths: [binPath]) {

     

       27
       27
       +
       +        clangPath = tool

     

       28
       28
       +
       +      } else {

     

       29
       29
       +
       +      clangPath = try getToolPath(clangTool)

     

       30
       30
       +
              if let toolsDirPath = parsedOptions.getLastArgument(.toolsDirectory) {

     

       31
       31
       +
                // FIXME: What if this isn't an absolute path?

     

       32
       32
       +
                let toolsDir = try AbsolutePath(validating: toolsDirPath.asSingle)

     

       33
       33
       +
       @@ -132,6 +146,7 @@ extension GenericUnixToolchain {

     

       34
       34
       +
                commandLine.appendFlag("-B")

     

       35
       35
       +
                commandLine.appendPath(toolsDir)

     

       36
       36
       +
              }

     

       37
       37
       +
       +      } // nixCC

     

       38
       38
       +
        

     

       39
       39
       +
              // Executables on Linux get -pie

     

       40
       40
       +
              if targetTriple.os == .linux && linkerOutputType == .executable {

+28

pkgs/development/compilers/swift/swift-driver/patches/nix-resource-root.patch

···

       1
       1
       +
       Swift normally looks for the Clang resource dir in a subdir/symlink of its own

     

       2
       2
       +
       resource dir. We provide a symlink to the Swift build-time Clang as a default

     

       3
       3
       +
       there, but we also here patch a check to try locate it via NIX_CC.

     

       4
       4
       +
       

     

       5
       5
       +
       --- a/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift

     

       6
       6
       +
       +++ b/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift

     

       7
       7
       +
       @@ -9,6 +9,7 @@

     

       8
       8
       +
        // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

     

       9
       9
       +
        //

     

       10
       10
       +
        //===----------------------------------------------------------------------===//

     

       11
       11
       +
       +import Foundation

     

       12
       12
       +
        import TSCBasic

     

       13
       13
       +
        import SwiftOptions

     

       14
       14
       +
        

     

       15
       15
       +
       @@ -24,6 +25,13 @@ extension Toolchain {

     

       16
       16
       +
            for targetInfo: FrontendTargetInfo,

     

       17
       17
       +
            parsedOptions: inout ParsedOptions

     

       18
       18
       +
          ) throws -> VirtualPath {

     

       19
       19
       +
       +    let env = ProcessInfo.processInfo.environment

     

       20
       20
       +
       +    if let nixCC = env["NIX_CC"] {

     

       21
       21
       +
       +      return try VirtualPath(path: nixCC)

     

       22
       22
       +
       +        .appending(components: "resource-root", "lib",

     

       23
       23
       +
       +                   targetInfo.target.triple.platformName(conflatingDarwin: true)!)

     

       24
       24
       +
       +    }

     

       25
       25
       +
       +

     

       26
       26
       +
            return VirtualPath.lookup(targetInfo.runtimeResourcePath.path)

     

       27
       27
       +
              .appending(components: "clang", "lib",

     

       28
       28
       +
                         targetInfo.target.triple.platformName(conflatingDarwin: true)!)

+16

pkgs/development/compilers/swift/swift-driver/patches/prevent-sdk-dirs-warnings.patch

···

       1
       1
       +
       Prevents a user-visible warning on every compilation:

     

       2
       2
       +
       

     

       3
       3
       +
         ld: warning: directory not found for option '-L.../MacOSX11.0.sdk/usr/lib/swift'

     

       4
       4
       +
       

     

       5
       5
       +
       --- a/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift

     

       6
       6
       +
       +++ b/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift

     

       7
       7
       +
       @@ -50,7 +50,9 @@ extension Toolchain {

     

       8
       8
       +
                result.append(sdkPath.appending(components: "System", "iOSSupport", "usr", "lib", "swift"))

     

       9
       9
       +
              }

     

       10
       10
       +
        

     

       11
       11
       +
       +      if sdkPath.absolutePath?.pathString.starts(with: "@storeDir@") == false {

     

       12
       12
       +
              result.append(sdkPath.appending(components: "usr", "lib", "swift"))

     

       13
       13
       +
       +      }

     

       14
       14
       +
            }

     

       15
       15
       +
        

     

       16
       16
       +
            return result

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

···

       406
       406
        
           swiftpmMakeMutable swift-tools-support-core

     

       407
       407
        
           substituteInPlace .build/checkouts/swift-tools-support-core/Sources/TSCTestSupport/XCTestCasePerf.swift \

     

       408
       408
        
             --replace 'canImport(Darwin)' 'false'

     

       409
       409
       +
       

     

       410
       410
       +
           # Prevent a warning about SDK directories we don't have.

     

       411
       411
       +
           swiftpmMakeMutable swift-driver

     

       412
       412
       +
           patch -p1 -d .build/checkouts/swift-driver -i ${substituteAll {

     

       413
       413
       +
             src = ../swift-driver/patches/prevent-sdk-dirs-warnings.patch;

     

       414
       414
       +
             inherit (builtins) storeDir;

     

       415
       415
       +
           }}

     

       409
       416
        
         '';

     

       410
       417
        
       

     

       411
       418
        
         buildPhase = ''

+11 -2

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

···

       1
       1
       -
       { stdenv

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , swift

     

       3
       4
        
       , wrapperParams ? swift._wrapperParams

     

       5
       5
       +
       , useSwiftDriver ? true, swift-driver

     

       4
       6
        
       }:

     

       5
       7
        
       

     

       6
       8
        
       stdenv.mkDerivation (wrapperParams // {

     
···

       9
       11
        
       

     

       10
       12
        
         outputs = [ "out" "man" ];

     

       11
       13
        
       

     

       12
       12
       -
         # Setup hook variables.

     

       14
       14
       +
         # Wrapper and setup hook variables.

     

       13
       15
        
         inherit swift;

     

       14
       16
        
         inherit (swift)

     

       15
       17
        
           swiftOs swiftArch

     

       16
       18
        
           swiftModuleSubdir swiftLibSubdir

     

       17
       19
        
           swiftStaticModuleSubdir swiftStaticLibSubdir;

     

       20
       20
       +
         swiftDriver = if useSwiftDriver

     

       21
       21
       +
           then "${swift-driver}/bin/swift-driver" else "";

     

       18
       22
        
       

     

       19
       23
        
         passAsFile = [ "buildCommand" ];

     

       20
       24
        
         buildCommand = ''

     
···

       32
       36
        
             substituteAll '${./wrapper.sh}' $out/bin/$executable

     

       33
       37
        
             chmod a+x $out/bin/$executable

     

       34
       38
        
           done

     

       39
       39
       +
       

     

       40
       40
       +
           ${lib.optionalString useSwiftDriver ''

     

       41
       41
       +
           # Symlink swift-driver executables.

     

       42
       42
       +
           ln -s -t $out/bin/ ${swift-driver}/bin/*

     

       43
       43
       +
           ''}

     

       35
       44
        
       

     

       36
       45
        
           ln -s ${swift.man} $man

     

       37
       46

+25

pkgs/development/compilers/swift/wrapper/wrapper.sh

···

       63
       63
        
               ;;

     

       64
       64
        
       esac

     

       65
       65
        
       

     

       66
       66
       +
       # For many tasks, Swift reinvokes swift-driver, the new driver implementation

     

       67
       67
       +
       # written in Swift. It needs some help finding the executable, though, and

     

       68
       68
       +
       # reimplementing the logic here is little effort. These checks follow

     

       69
       69
       +
       # `shouldDisallowNewDriver`.

     

       70
       70
       +
       if [[

     

       71
       71
       +
           $isFrontend = 0 &&

     

       72
       72
       +
           -n "@swiftDriver@" &&

     

       73
       73
       +
           -z "${SWIFT_USE_OLD_DRIVER:-}" &&

     

       74
       74
       +
           ( "$progName" == "swift" || "$progName" == "swiftc" )

     

       75
       75
       +
       ]]; then

     

       76
       76
       +
           prog=@swiftDriver@

     

       77
       77
       +
           # Driver mode must be the very first argument.

     

       78
       78
       +
           extraBefore+=( "--driver-mode=$progName" )

     

       79
       79
       +
           if [[ $isRepl = 1 ]]; then

     

       80
       80
       +
               extraBefore+=( "-repl" )

     

       81
       81
       +
           fi

     

       82
       82
       +
       

     

       83
       83
       +
           # Ensure swift-driver invokes the unwrapped frontend (instead of finding

     

       84
       84
       +
           # the wrapped one via PATH), because we don't have to wrap a second time.

     

       85
       85
       +
           export SWIFT_DRIVER_SWIFT_FRONTEND_EXEC="@swift@/bin/swift-frontend"

     

       86
       86
       +
       

     

       87
       87
       +
           # Ensure swift-driver can find the LLDB with Swift support for the REPL.

     

       88
       88
       +
           export SWIFT_DRIVER_LLDB_EXEC="@swift@/bin/lldb"

     

       89
       89
       +
       fi

     

       90
       90
       +
       

     

       66
       91
        
       path_backup="$PATH"

     

       67
       92
        
       

     

       68
       93
        
       # That @-vars are substituted separately from bash evaluation makes