cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

swift: Fix build for glibc 2.30

Browse source
This commit is contained in:
Silvan Mosberger 2020-02-21 10:02:16 +01:00
parent 1ddb140d95
commit 7d8a33125f
No known key found for this signature in database
GPG key ID: E8F1E9EAD284E17D
2 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/compilers/swift/default.nix
View file

@ -26,6 +26,7 @@
, git
, libgit2
, fetchFromGitHub
, fetchpatch
, findutils
, makeWrapper
, gnumake
@ -224,6 +225,15 @@ stdenv.mkDerivation {
# uuid.h is not part of glibc, but of libuuid
sed -i 's|''${GLIBC_INCLUDE_PATH}/uuid/uuid.h|${libuuid.dev}/include/uuid/uuid.h|' swift/stdlib/public/Platform/glibc.modulemap.gyb
# Compatibility with glibc 2.30
# Adapted from https://github.com/apple/swift-package-manager/pull/2408
patch -p1 -d swiftpm -i ${./patches/swift-package-manager-glibc-2.30.patch}
# https://github.com/apple/swift/pull/27288
patch -p1 -d swift -i ${fetchpatch {
url = "https://github.com/apple/swift/commit/f968f4282d53f487b29cf456415df46f9adf8748.patch";
sha256 = "1aa7l66wlgip63i4r0zvi9072392bnj03s4cn12p706hbpq0k37c";
}}
PREFIX=''${out/#\/}
substituteInPlace indexstore-db/Utilities/build-script-helper.py \
--replace usr "$PREFIX"

25
pkgs/development/compilers/swift/patches/swift-package-manager-glibc-2.30.patch Normal file
View file

@ -0,0 +1,25 @@
diff --git a/Sources/Basic/Process.swift b/Sources/Basic/Process.swift
index f388c769..8f208691 100644
--- a/Sources/Basic/Process.swift
+++ b/Sources/Basic/Process.swift
@@ -322,7 +322,10 @@ public final class Process: ObjectIdentifierProtocol {
defer { posix_spawn_file_actions_destroy(&fileActions) }
// Workaround for https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=89e435f3559c53084498e9baad22172b64429362
- let devNull = strdup("/dev/null")
+ // Change allowing for newer version of glibc
+ guard let devNull = strdup("/dev/null") else {
+ throw SystemError.posix_spawn(0, arguments)
+ }
defer { free(devNull) }
// Open /dev/null as stdin.
posix_spawn_file_actions_addopen(&fileActions, 0, devNull, O_RDONLY, 0)
@@ -348,7 +351,7 @@ public final class Process: ObjectIdentifierProtocol {
let argv = CStringArray(arguments)
let env = CStringArray(environment.map({ "\($0.0)=\($0.1)" }))
- let rv = posix_spawnp(&processID, argv.cArray[0], &fileActions, &attributes, argv.cArray, env.cArray)
+ let rv = posix_spawnp(&processID, argv.cArray[0]!, &fileActions, &attributes, argv.cArray, env.cArray)
guard rv == 0 else {
throw SystemError.posix_spawn(rv, arguments)