| 23 Feb 2023 |
 @lily:lily.flowers | Honestly maybe the -m 0755 can just be removed if it's clearly not needed.... | 18:00:51 |
 @elvishjerricco:matrix.org | thanks | 18:00:51 |
| @elvishjerricco:matrix.org | lol fair point | 18:01:02 |
| @lily:lily.flowers | Question: Can we make this ln -sf so that I can override built in bins (I really want bashInteractive in my initrd so I have tab completion while mucking around debugging plymouth...): https://github.com/NixOS/nixpkgs/blob/ac573e5046f1e2ff60e4260771a88b9862fa7148/nixos/modules/system/boot/systemd/initrd.nix#L121 | 18:14:39 |
| @lily:lily.flowers | * Question: Can we make this ln -sf so that I can override built-in bins (I really want bashInteractive in my initrd so I have tab completion while mucking around debugging plymouth...): https://github.com/NixOS/nixpkgs/blob/ac573e5046f1e2ff60e4260771a88b9862fa7148/nixos/modules/system/boot/systemd/initrd.nix#L121 | 18:14:47 |
| @elvishjerricco:matrix.org | That sounds like a good idea | 18:15:26 |
| @elvishjerricco:matrix.org | I would expect extraBin to override whatever is there normally | 18:15:38 |
| @lily:lily.flowers | Sweet, I'll prep 2 PRs then | 18:15:41 |
| @elvishjerricco:matrix.org | tab completion in initrd is something I've been sorely wanting :P | 18:16:38 |
| @lily:lily.flowers | In reply to @elvishjerricco:matrix.org
tab completion in initrd is something I've been sorely wanting :P Do you want a switch to enable it too? | 18:16:56 |
| @lily:lily.flowers | (I kinda wanted that too...) | 18:17:15 |
| @elvishjerricco:matrix.org | I doubt that's necessary. After all, it should be just one line either way. enableInteractive vs extraBin.bash | 18:17:44 |
| @lily:lily.flowers | Fair | 18:17:54 |
| @elvishjerricco:matrix.org | unless there's more to getting tab completion | 18:17:58 |
| @lily:lily.flowers | There is not, I can confirm | 18:24:45 |
| @lily:lily.flowers | Just boot.initrd.systemd.extraBin = { sh = "${pkgs.bashInteractive}/bin/sh"; }; | 18:25:04 |
| @elvishjerricco:matrix.org | nice | 18:25:12 |
| 28 Feb 2023 |
| @lily:lily.flowers | In reply to @kranzes:matrix.org
https://github.com/NixOS/nixpkgs/pull/217728 Okay, it took me a while to get back to it, but I got plymouth working. You removed the stuff that was fixing up the compiled-in runtime dirs when converting to Meson so it really just required one quick thing for that and I removed a few other unnecessary things. I'll make a proper review in a bit for you with the fixes | 23:56:06 |
| 1 Mar 2023 |
 @kranzes:matrix.org | Great | 00:11:53 |
| @kranzes:matrix.org | Are the unnecessary things other meson flags? | 00:12:19 |
| @kranzes:matrix.org | I thought it'd be better to enable everything like it was before | 00:12:42 |
| @kranzes:matrix.org | Instead of relying on the default/auto options | 00:12:53 |
| @lily:lily.flowers | Here's the diff I'm currently testing:
diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix
index f2abfa68682..42ba23901e0 100644
--- a/pkgs/os-specific/linux/plymouth/default.nix
+++ b/pkgs/os-specific/linux/plymouth/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
pname = "plymouth";
version = "unstable-2023-02-22";
+ outputs = [ "out" "dev" ];
+
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = pname;
@@ -30,7 +32,6 @@ stdenv.mkDerivation rec {
};
patches = [
- ./add-option-for-installation-sysconfdir.patch
./dont-create-broken-symlink.patch
];
@@ -55,7 +56,6 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
- "--sysconfdir=/etc"
"-Dlogo=/etc/plymouth/logo.png"
"-Dbackground-color=0x000000"
"-Dbackground-start-color-stop=0x000000"
@@ -74,6 +74,10 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace meson.build \
+ --replace "'PLYMOUTH_THEME_PATH', plymouth_theme_path" "'PLYMOUTH_THEME_PATH', '/etc/plymouth/themes'" \
+ --replace "'PLYMOUTH_PLUGIN_PATH', plymouth_plugin_path" "'PLYMOUTH_PLUGIN_PATH', '/etc/plymouth/plugins/'" \
+ --replace "'PLYMOUTH_POLICY_DIR', plymouth_policy_dir" "'PLYMOUTH_POLICY_DIR', '/etc/plymouth/'" \
+ --replace "'PLYMOUTH_CONF_DIR', plymouth_conf_dir" "'PLYMOUTH_CONF_DIR', '/etc/plymouth/'" \
--replace "run_command(['scripts/generate-version.sh'], check: true).stdout().strip()" "'${version}'"
sed -i '/^install_emptydir/d' src/meson.build
| 00:13:17 |
| @lily:lily.flowers | I left most of the meson flags as default | 00:13:33 |
| @lily:lily.flowers | I'm double checking that flicker-free boot in a VM works seamlessly like before just to be sure there are no regressions from the update | 00:14:42 |
| @lily:lily.flowers | In reply to @kranzes:matrix.org
Are the unnecessary things other meson flags? (so to clarify, unnecessary things were the sysconf related patch and flag, since it does the right thing by default and has similar semantics to the autoconf script -- which means we still need to manually patch the compiled-in definitions like the autoconf scripts though, it seems) | 00:16:41 |
| @kranzes:matrix.org | Can't view diff on mobile oof | 00:18:25 |
| @kranzes:matrix.org | Anyway I'm going to bed now, i need to be at school in 6 hours 😬 | 00:19:12 |
| @kranzes:matrix.org | I'll check your suggestions tomorrow | 00:19:26 |
| @lily:lily.flowers | Sounds good, rest well! | 00:19:33 |
