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: 76a43d765cc9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 204b73ffba34
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 14, 2018

  1. Fix stdenv-native by creating a bintools wrapper with similar settings

    @svanderburg
    svanderburg committed Apr 14, 2018
    Copy the full SHA
    5a545ca View commit details

  2. Fix invalid Baseaddress must be > 0x200000000 on cygwin

    @svanderburg
    svanderburg committed Apr 14, 2018
    Copy the full SHA
    a7adffd View commit details

Commits on Apr 18, 2018

  1. Merge pull request #38932 from svanderburg/cygwin-fixes 

    Fix stdenv-native and fix rebasing on cygwin
    @Ericson2314
    Ericson2314 authored Apr 18, 2018

    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
    204b73f View commit details
Showing with 14 additions and 5 deletions.
  1. +1 −1 pkgs/stdenv/cygwin/rebase-x86_64.sh
  2. +13 −4 pkgs/stdenv/native/default.nix
2 changes: 1 addition & 1 deletion pkgs/stdenv/cygwin/rebase-x86_64.sh
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ _cygwinFixAutoImageBase() {
if [ -f /etc/rebasenix.nextbase ]; then
NEXTBASE="$(</etc/rebasenix.nextbase)"
fi
NEXTBASE=${NEXTBASE:-0x200000000}
NEXTBASE=${NEXTBASE:-0x200000001}

REBASE=(`/bin/rebase -i $DLL`)
BASE=${REBASE[2]}
17 changes: 13 additions & 4 deletions pkgs/stdenv/native/default.nix
View file
Original file line number Diff line number Diff line change
@@ -119,14 +119,23 @@ in
};
stdenvNoCC = stdenv;

cc = import ../../build-support/cc-wrapper {
name = "cc-native";
nativeTools = true;
nativeLibc = true;
cc = let
nativePrefix = { # switch
"i686-solaris" = "/usr/gnu";
"x86_64-solaris" = "/opt/local/gcc47";
}.${system} or "/usr";
in
import ../../build-support/cc-wrapper {
name = "cc-native";
nativeTools = true;
nativeLibc = true;
inherit nativePrefix;
bintools = import ../../build-support/bintools-wrapper {
name = "bintools";
inherit stdenvNoCC nativePrefix;
nativeTools = true;
nativeLibc = true;
};
inherit stdenvNoCC;
};