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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
This commit is contained in:
Tuomas Tynkkynen
2018-02-28 20:52:49 +02:00
parent ad17db3562 f1dd205c4e
commit 34f95d92a2
261 changed files with 3045 additions and 2049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/stdenv/linux/default.nix
View File

@@ -15,7 +15,7 @@
"armv6l-linux" = import ./bootstrap-files/armv6l.nix;
"armv7l-linux" = import ./bootstrap-files/armv7l.nix;
"aarch64-linux" = import ./bootstrap-files/aarch64.nix;
"mips64el-linux" = import ./bootstrap-files/loongson2f.nix;
"mipsel-linux" = import ./bootstrap-files/loongson2f.nix;
};
"musl" = {
"aarch64-linux" = import ./bootstrap-files/aarch64-musl.nix;
@@ -40,7 +40,7 @@ let
export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}"
export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}"
${if system == "x86_64-linux" then "NIX_LIB64_IN_SELF_RPATH=1" else ""}
${if system == "mips64el-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""}
${if system == "mipsel-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""}
'';