nix-community/raspberry-pi-nix
1
0
Fork 0
mirror of https://github.com/nix-community/raspberry-pi-nix.git synced 2025-11-08 19:46:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove overrideDerivation

Browse source 
It wasn't fully applied and it isn't necessary for these overrides anyway
This commit is contained in:
Travis Staton 2024-06-24 09:18:51 -04:00
parent 50e36bf86a
commit f0c963957b
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
overlays/default.nix
View file

@ -41,13 +41,13 @@ let
version-slug = builtins.replaceStrings [ "v" "_" ] [ "" "." ] version; version-slug = builtins.replaceStrings [ "v" "_" ] [ "" "." ] version;
in in
{ {
"${version}"."${board}" = prev.lib.overrideDerivation (prev.buildLinux { "${version}"."${board}" = (final.buildLinux {
modDirVersion = version-slug; modDirVersion = version-slug;
version = version-slug; version = version-slug;
pname = "linux-rpi"; pname = "linux-rpi";
src = kernel.src; src = kernel.src;
defconfig = "${board}_defconfig"; defconfig = "${board}_defconfig";
structuredExtraConfig = with prev.lib.kernel; { structuredExtraConfig = with final.lib.kernel; {
# Workaround https://github.com/raspberrypi/linux/issues/6198 # Workaround https://github.com/raspberrypi/linux/issues/6198
# Needed because NixOS 24.05+ sets DRM_SIMPLEDRM=y which pulls in # Needed because NixOS 24.05+ sets DRM_SIMPLEDRM=y which pulls in
# DRM_KMS_HELPER=y. # DRM_KMS_HELPER=y.
@ -72,14 +72,16 @@ let
KUNIT = no; KUNIT = no;
}; };
features.efiBootStub = false; features.efiBootStub = false;
postConfigure = '' kernelPatches =
# The v7 defconfig has this set to '-v7' which screws up our modDirVersion. if kernel ? "patches" then kernel.patches else [ ];
sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/' }).overrideAttrs
sed -i $buildRoot/include/config/auto.conf -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/' (oldAttrs: {
''; postConfigure = ''
postFixup = ""; # The v7 defconfig has this set to '-v7' which screws up our modDirVersion.
kernelPatches = if kernel.patches != null then kernel.patches else [ ]; sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
}); sed -i $buildRoot/include/config/auto.conf -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
'';
});
}; };
rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { }; rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { };
in in