diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-11-07 17:09:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-07 17:09:32 -0500 |
| commit | 0aaab30d2a94eccfcad159f951a630cc557086fe (patch) | |
| tree | 45ae54fed8ca74438e296c96b438eafe3a5bfa5e /pkgs/os-specific | |
| parent | a40718a8dc551e6769531a2477067341f3e58b63 (diff) | |
| parent | 26ff3da4b774934cd877332f920dacedf544197d (diff) | |
| download | nixpkgs-0aaab30d2a94eccfcad159f951a630cc557086fe.tar nixpkgs-0aaab30d2a94eccfcad159f951a630cc557086fe.tar.gz nixpkgs-0aaab30d2a94eccfcad159f951a630cc557086fe.tar.bz2 nixpkgs-0aaab30d2a94eccfcad159f951a630cc557086fe.tar.lz nixpkgs-0aaab30d2a94eccfcad159f951a630cc557086fe.tar.xz nixpkgs-0aaab30d2a94eccfcad159f951a630cc557086fe.tar.zst nixpkgs-0aaab30d2a94eccfcad159f951a630cc557086fe.zip | |
Merge pull request #69741 from eadwu/linux_rpi/fix-overrides
linux_rpi: fix overrides
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-rpi.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index f8ad6b37a19..c22866742b9 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -33,7 +33,7 @@ lib.overrideDerivation (buildLinux (args // { platforms = with lib.platforms; [ arm aarch64 ]; hydraPlatforms = [ "aarch64-linux" ]; }; -})) (oldAttrs: { +} // (args.argsOverride or {}))) (oldAttrs: { postConfigure = '' # The v7 defconfig has this set to '-v7' which screws up our modDirVersion. sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/' |