commit 1884f3de79c051f5c9e4da171fac7097ac6e7b6b · pyrox.dev/nixpkgs

+10 -1

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

···

       30
       30
        
           XCTest

     

       31
       31
        
         ];

     

       32
       32
        
       

     

       33
       33
       -
         configurePhase = generated.configure;

     

       33
       33
       +
         configurePhase =

     

       34
       34
       +
           generated.configure

     

       35
       35
       +
           # Fix the build with modern Clang.

     

       36
       36
       +
           #

     

       37
       37
       +
           # Based on the upstream fix for Musl:

     

       38
       38
       +
           # <https://github.com/apple/swift-nio/commit/fc6e3c0eefb28adf641531180b81aaf41b02ed20>

     

       39
       39
       +
           + ''

     

       40
       40
       +
             swiftpmMakeMutable swift-nio

     

       41
       41
       +
             patch -p1 -d .build/checkouts/swift-nio -i ${./fix-swift-nio.patch}

     

       42
       42
       +
           '';

     

       34
       43
        
       

     

       35
       44
        
         # We only install the docc binary, so don't need the other products.

     

       36
       45
        
         # This works around a failure building generate-symbol-graph:

+13

pkgs/development/compilers/swift/swift-docc/fix-swift-nio.patch

···

       1
       1
       +
       diff --git a/Package.swift b/Package.swift

     

       2
       2
       +
       index 39c6fb4b2f..02c08b898d 100644

     

       3
       3
       +
       --- a/Package.swift

     

       4
       4
       +
       +++ b/Package.swift

     

       5
       5
       +
       @@ -26,7 +26,7 @@

     

       6
       6
       +
            .target(name: "NIOFoundationCompat", dependencies: ["NIO"]),

     

       7
       7
       +
            .target(name: "CNIOAtomics", dependencies: []),

     

       8
       8
       +
            .target(name: "CNIOSHA1", dependencies: []),

     

       9
       9
       +
       -    .target(name: "CNIOLinux", dependencies: []),

     

       10
       10
       +
       +    .target(name: "CNIOLinux", dependencies: [], cSettings: [.define("_GNU_SOURCE")]),

     

       11
       11
       +
            .target(name: "CNIODarwin", dependencies: [], cSettings: [.define("__APPLE_USE_RFC_3542")]),

     

       12
       12
       +
            .target(name: "CNIOWindows", dependencies: []),

     

       13
       13
       +
            .target(name: "NIOConcurrencyHelpers",