wayfire: remove optional toString#1658
Conversation
If the current approach does not work, the diff --git a/modules/wayfire/hm.nix b/modules/wayfire/hm.nix
index d11ad25..7b8b814 100644
--- a/modules/wayfire/hm.nix
+++ b/modules/wayfire/hm.nix
@@ -26,9 +26,11 @@ mkTarget {
imageScalingMode,
}:
let
- wayfireBackground = pkgs.runCommand "wayfire-background.png" { } ''
- ${lib.getExe' pkgs.imagemagick "convert"} ${image} $out
- '';
+ wayfireBackground = toString (
+ pkgs.runCommand "wayfire-background.png" { } ''
+ ${lib.getExe' pkgs.imagemagick "convert"} ${image} $out
+ ''
+ );
in
{
wayland.windowManager.wayfire.wf-shell.settings = { |
|
What about this might not work? Straight eval failure? EDIT: yes. |
|
Tested, and the EDIT: Created nix-community/home-manager#7427 to address this. If merged, I will create a follow up PR here to get rid of |
6e44d19 to
a36e8b1
Compare
Thanks :) If the only additional change is updating the Home Manager input, I can also do it in this PR. I leave it up to you. Either way, I am converting this PR to a draft until nix-community/home-manager#7427 is merged. |
|
The home-manager PR was merged, you can also make the update here. I'll test it again then |
a36e8b1 to
f3f2903
Compare
I have updated the |
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-25.05
git worktree add -d .worktree/backport-1658-to-release-25.05 origin/release-25.05
cd .worktree/backport-1658-to-release-25.05
git switch --create backport-1658-to-release-25.05
git cherry-pick -x a950a3f529e1952a7ddf2af138b90a99edf41fe5 |
The nix-community/home-manager#7427 PR has not been backported to the stable branch yet. Since this is a fairly low priority change, we can just not backport this for the time being. |
Link: nix-community#1658 Reviewed-by: 1444 <54070204+0x5a4@users.noreply.github.com> Tested-by: 1444 <54070204+0x5a4@users.noreply.github.com>
This PR should not be merged untested.
Things done
Notify maintainers
@0x5a4