Skip to content

Commit

Permalink
Merge pull request #296 from MetaDark/concatenate-paths
Browse files Browse the repository at this point in the history
kernel-builder: Avoid string interpolation for path concatenation
  • Loading branch information
samueldr committed Feb 8, 2021
2 parents 7cb18ef + e8c77e2 commit 1c54996
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions overlay/mobile-nixos/kernel/builder.nix
Expand Up @@ -127,7 +127,7 @@ in

let
# Path within <nixpkgs> to refer to the kernel build system's file.
nixosKernelPath = "${path}/pkgs/os-specific/linux/kernel/";
nixosKernelPath = path + "/pkgs/os-specific/linux/kernel";

# Same installer as in <nixpkgs>, though they don't expose it :/.
installkernel = writeTextFile {
Expand Down Expand Up @@ -189,7 +189,7 @@ stdenv.mkDerivation (inputArgs // {
patches =
map (p: p.patch) kernelPatches
# Required for deterministic builds along with some postPatch magic.
++ optional (lib.versionAtLeast version "4.13") "${nixosKernelPath}/randstruct-provide-seed.patch"
++ optional (lib.versionAtLeast version "4.13") (nixosKernelPath + "/randstruct-provide-seed.patch")
++ patches
;

Expand Down

0 comments on commit 1c54996

Please sign in to comment.