Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix nixUnstable cross compilation #107909

Closed
wants to merge 2 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions pkgs/tools/package-management/nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ common =

VERSION_SUFFIX = suffix;

outputs = [ "out" "dev" "man" "doc" ];
outputs = [ "out" "dev" ] ++ lib.optionals (!(is24 && stdenv.hostPlatform != stdenv.buildPlatform)) [ "man" "doc" ];

nativeBuildInputs =
[ pkgconfig ]
Expand All @@ -54,7 +54,7 @@ common =
brotli boost editline
]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is24 [ libarchive gmock ]
++ lib.optionals is24 [ libarchive gmock lowdown ]
++ lib.optional withLibseccomp libseccomp
++ lib.optional withAWS
((aws-sdk-cpp.override {
Expand Down Expand Up @@ -122,7 +122,8 @@ common =
stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system
) ''--with-system=${stdenv.hostPlatform.nix.system}''
# RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing";
++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing"
++ lib.optional (is24 && stdenv.hostPlatform != stdenv.buildPlatform) "--disable-doc-gen";

makeFlags = [ "profiledir=$(out)/etc/profile.d" ]
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0";
Expand Down Expand Up @@ -199,13 +200,13 @@ in rec {

nixUnstable = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}";
suffix = "pre20201201_5a6ddb3";
suffix = "pre20201228_abbf9df";

src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "5a6ddb3de14a1684af6c793d663764d093fa7846";
sha256 = "0qhd3nxvqzszzsfvh89xhd239ycqb0kq2n0bzh9br78pcb60vj3g";
rev = "abbf9df7b1c4219d5a6d3234d9149204208be7de";
sha256 = "1bsdmy98j7hmp9r28plfx0745g69m1pcmrrzcby7r8wk0fpscvq1";
};

inherit storeDir stateDir confDir boehmgc;
Expand Down