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.

Sign up for GitHub

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

lib/systems: revert #221707 if stdenv.hostPlatform.isPower #244436

Closed
wants to merge 1 commit into from
+5 −2
Closed

lib/systems: revert #221707 if stdenv.hostPlatform.isPower #244436

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions pkgs/os-specific/linux/kernel/manual-config.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,10 @@ stdenv.mkDerivation ({
fi
'';

postUnpack = ''
# https://github.com/NixOS/nixpkgs/pull/221707 added the following
# postUnpack, which broke the build on powerpc by creating cyclic
# outpath references, so we disable it on that platform.
postUnpack = lib.optionalString (!stdenv.hostPlatform.isPower) ''
mv -Tv "$sourceRoot" source 2>/dev/null || :
export sourceRoot=$PWD/source
'';
Expand Down Expand Up @@ -312,7 +315,7 @@ stdenv.mkDerivation ({
unlink $out/lib/modules/${modDirVersion}/build
unlink $out/lib/modules/${modDirVersion}/source

mkdir $dev/lib/modules/${modDirVersion}/build
mkdir $dev/lib/modules/${modDirVersion}/{build,source}

cd $dev/lib/modules/${modDirVersion}/source

Expand Down