colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #38932 from svanderburg/cygwin-fixes

Browse Source 
Fix stdenv-native and fix rebasing on cygwin
This commit is contained in:
John Ericson 2018-04-18 11:05:19 -04:00 committed by GitHub
commit 204b73ffba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/stdenv/cygwin/rebase-x86_64.sh
View File

@ -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
pkgs/stdenv/native/default.nix
View File

@ -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;
};