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: 9fc4a4db5a40
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 051812b8cfed
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 13, 2020

  1. bintools-wrapper: remove redundant arg 

    cctools 949.0.1 warns if min version is passed twice.
    @zowoq
    zowoq committed Nov 13, 2020
    Copy the full SHA
    473b341 View commit details

  2. Revert "ruby: fix build on darwin" 

    This reverts commit d73cc1e.
    @zowoq
    zowoq committed Nov 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    051812b View commit details
Showing with 1 addition and 5 deletions.
  1. +1 −1 pkgs/build-support/bintools-wrapper/default.nix
  2. +0 −4 pkgs/development/interpreters/ruby/default.nix
2 changes: 1 addition & 1 deletion pkgs/build-support/bintools-wrapper/default.nix
View file
Original file line number Diff line number Diff line change
@@ -253,7 +253,7 @@ stdenv.mkDerivation {

# Ensure consistent LC_VERSION_MIN_MACOSX and remove LC_UUID.
+ optionalString stdenv.targetPlatform.isMacOS ''
echo "-macosx_version_min 10.12 -sdk_version 10.12 -no_uuid" >> $out/nix-support/libc-ldflags-before
echo "-sdk_version 10.12 -no_uuid" >> $out/nix-support/libc-ldflags-before
''

##
4 changes: 0 additions & 4 deletions pkgs/development/interpreters/ruby/default.nix
View file
Original file line number Diff line number Diff line change
@@ -140,10 +140,6 @@ let
"--with-out-ext=tk"
# on yosemite, "generating encdb.h" will hang for a very long time without this flag
"--with-setjmp-type=setjmp"
# silence linker warnings after upgrading darwin.cctools to 949.0.1,
# which ruby treats as problem with LDFLAGS
# https://github.com/NixOS/nixpkgs/issues/101330
"LDFLAGS=-Wl,-w"
]
++ op (stdenv.hostPlatform != stdenv.buildPlatform)
"--with-baseruby=${buildRuby}";