diff options
| author | Michael Roitzsch <reactorcontrol@icloud.com> | 2019-10-21 10:39:03 +0200 |
|---|---|---|
| committer | Michael Roitzsch <reactorcontrol@icloud.com> | 2020-01-15 13:19:35 +0100 |
| commit | 29098a81b3720590cde0b0b92bfbf3e66fd9d31b (patch) | |
| tree | 178eefa2e04f8e2f1c07eec4ffa5f68f03721371 /pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch | |
| parent | e4bc7a1c1da34de677b26dc2b39f971a749f182c (diff) | |
| download | nixpkgs-29098a81b3720590cde0b0b92bfbf3e66fd9d31b.tar nixpkgs-29098a81b3720590cde0b0b92bfbf3e66fd9d31b.tar.gz nixpkgs-29098a81b3720590cde0b0b92bfbf3e66fd9d31b.tar.bz2 nixpkgs-29098a81b3720590cde0b0b92bfbf3e66fd9d31b.tar.lz nixpkgs-29098a81b3720590cde0b0b92bfbf3e66fd9d31b.tar.xz nixpkgs-29098a81b3720590cde0b0b92bfbf3e66fd9d31b.tar.zst nixpkgs-29098a81b3720590cde0b0b92bfbf3e66fd9d31b.zip | |
swift: refactor phases and patch documentation
* simplify versioning * uniform patch documentation * reorder phases so they read in order * reorder scripts for readability * GNU toolchain dir: handle sysroot for GNU toolchain like for C headers, so that GCC_INSTALL_PREFIX is actually used correctly
Diffstat (limited to 'pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch')
| -rw-r--r-- | pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch index 1d0a6a9577a..9710f6a1083 100644 --- a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch +++ b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch @@ -1,14 +1,5 @@ -From 4a46b12f580d0a9779937d07c4f1fd347570c4ef Mon Sep 17 00:00:00 2001 -From: Will Dietz <w@wdtz.org> -Date: Tue, 28 Mar 2017 15:02:37 -0500 -Subject: [PATCH 4/4] build-presets: (linux) plumb extra-cmake-options +plumb extra-cmake-options ---- - utils/build-presets.ini | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/utils/build-presets.ini b/utils/build-presets.ini -index 1739e91dc2..0608fed9c1 100644 --- a/utils/build-presets.ini +++ b/utils/build-presets.ini @@ -743,6 +743,8 @@ install-destdir=%(install_destdir)s @@ -20,6 +11,3 @@ index 1739e91dc2..0608fed9c1 100644 [preset: buildbot_linux] mixin-preset=mixin_linux_installation build-subdir=buildbot_linux --- -2.12.2 - |