Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 449c060d1250
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1c32029731f5
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Apr 3, 2020

  1. plan9port: fix linker flags for macosx 

    (cherry picked from commit 4d2a825)
(cherry picked from commit 7724ef7)
    @eraserhd @LnL7
    eraserhd authored and LnL7 committed Apr 3, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    anthonyfok Anthony Fok
    GPG key ID: EA2500B412C59ACF
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6693266 View commit details

  2. bazel: fix linker flags for darwin 

    (cherry picked from commit d1ee615)
    @marsam @LnL7
    marsam authored and LnL7 committed Apr 3, 2020
    Copy the full SHA
    f941714 View commit details

  3. Merge pull request #80890 from LnL7/darwin-ldflags 

    darwin: fix NIX_LDFLAGS usages
    @LnL7
    LnL7 authored Apr 3, 2020
    Copy the full SHA
    1c32029 View commit details
Showing with 13 additions and 12 deletions.
  1. +10 −2 pkgs/development/tools/build-managers/bazel/bazel_2/default.nix
  2. +3 −10 pkgs/tools/system/plan9port/builder.sh
12 changes: 10 additions & 2 deletions pkgs/development/tools/build-managers/bazel/bazel_2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -326,6 +326,14 @@ stdenv.mkDerivation rec {
postPatch = let

darwinPatches = ''
bazelLinkFlags () {
eval set -- "$NIX_LDFLAGS"
local flag
for flag in "$@"; do
printf ' -Wl,%s' "$flag"
done
}
# Disable Bazel's Xcode toolchain detection which would configure compilers
# and linkers from Xcode instead of from PATH
export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
@@ -335,14 +343,14 @@ stdenv.mkDerivation rec {
# Framework search paths aren't added by bintools hook
# https://github.com/NixOS/nixpkgs/pull/41914
export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
# libcxx includes aren't added by libcxx hook
# https://github.com/NixOS/nixpkgs/pull/41589
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
# don't use system installed Xcode to run clang, use Nix clang instead
sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \
sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
scripts/bootstrap/compile.sh \
src/tools/xcode/realpath/BUILD \
src/tools/xcode/stdredirect/BUILD \
13 changes: 3 additions & 10 deletions pkgs/tools/system/plan9port/builder.sh
View file
Original file line number Diff line number Diff line change
@@ -5,18 +5,11 @@ export PLAN9_TARGET=$PLAN9

plan9portLinkFlags()
{
local -a linkFlags=()
eval set -- "$NIX_LDFLAGS"
while (( $# > 0 )); do
if [[ $1 = -rpath ]]; then
linkFlags+=( "-Wl,-rpath,$2" )
shift 2
else
linkFlags+=( "$1" )
shift
fi
local flag
for flag in "$@"; do
printf ' -Wl,%s' "$flag"
done
echo "${linkFlags[*]}"
}

configurePhase()