Skip to content

Instantly share code, notes, and snippets.

@samueldr
Created July 3, 2020 18:31
Show Gist options
  • Save samueldr/da46fe2b234a74daad3735a055fedf50 to your computer and use it in GitHub Desktop.
Save samueldr/da46fe2b234a74daad3735a055fedf50 to your computer and use it in GitHub Desktop.
diff --git a/modules/initrd-firmware.nix b/modules/initrd-firmware.nix
index e4219bc2451c..91ebd4a4bfda 100644
--- a/modules/initrd-firmware.nix
+++ b/modules/initrd-firmware.nix
@@ -24,7 +24,8 @@ in
config = {
mobile.boot.stage-1.contents = [
{
- object = "${firmware}/lib/firmware";
+ object = firmware;
+ suffix = "/lib/firmware";
symlink = "/lib/firmware";
}
];
diff --git a/modules/initrd-kernel.nix b/modules/initrd-kernel.nix
index f2539bd1cdd1..72419130efb7 100644
--- a/modules/initrd-kernel.nix
+++ b/modules/initrd-kernel.nix
@@ -71,8 +71,8 @@ in
config.mobile.boot.stage-1 = (mkIf cfg.modular {
contents = [
- { object = "${modulesClosure}/lib/modules"; symlink = "/lib/modules"; }
- { object = "${modulesClosure}/lib/firmware"; symlink = "/lib/firmware"; }
+ { object = modulesClosure; suffix = "/lib/modules"; symlink = "/lib/modules"; }
+ { object = modulesClosure; suffix = "/lib/firmware"; symlink = "/lib/firmware"; }
];
kernel.modules = [
# Basic always-needed kernel modules.
diff --git a/modules/initrd.nix b/modules/initrd.nix
index 954ebfc2021c..d4f0a98e1fd5 100644
--- a/modules/initrd.nix
+++ b/modules/initrd.nix
@@ -74,7 +74,7 @@ let
(optionals (stage-1 ? contents) (flatten stage-1.contents))
++ [
# Populate /bin/sh to stay POSIXLY compliant.
- { object = "${extraUtils}/bin/sh"; symlink = "/bin/sh"; }
+ { object = extraUtils; suffix = "/bin/sh"; symlink = "/bin/sh"; }
# The mostly device-specific configuration for the bootloader.
{ object = bootConfigFile; symlink = "/etc/boot/config"; }
@@ -83,9 +83,9 @@ let
{ object = udevRules; symlink = "/etc/udev/rules.d"; }
# Init components
- { object = "${extraUtils}/bin/loader"; symlink = "/loader"; }
+ { object = extraUtils; suffix = "/bin/loader"; symlink = "/loader"; }
{ object = initWrapper; symlink = "/init"; }
- { object = "${mobile-nixos-init}/libexec/init.mrb"; symlink = "/init.mrb"; }
+ { object = mobile-nixos-init; suffix = "/libexec/init.mrb"; symlink = "/init.mrb"; }
]
;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment