diff options
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | nix/default.nix | 17 | ||||
| -rw-r--r-- | nix/overlays.nix | 1 |
3 files changed, 12 insertions, 7 deletions
@@ -79,6 +79,7 @@ hyprland hyprland-debug hyprland-legacy-renderer + hyprland-unwrapped # hyprland-extras xdg-desktop-portal-hyprland diff --git a/nix/default.nix b/nix/default.nix index c4650d3c..a2a31818 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -33,6 +33,7 @@ enableXWayland ? true, legacyRenderer ? false, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, + wrapRuntimeDeps ? true, version ? "git", commit, date, @@ -94,13 +95,6 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov ++ lib.optionals enableXWayland [libxcb xcbutilwm xwayland] ++ lib.optionals withSystemd [systemd]; - # avoid wrapping - propagatedBuildInputs = [ - stdenv.cc - binutils - pciutils - ]; - mesonBuildType = if debug then "debug" @@ -140,6 +134,15 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov postInstall = '' ln -s ${wlroots}/include/wlr $dev/include/hyprland/wlroots + + ${lib.optionalString wrapRuntimeDeps '' + wrapProgram $out/bin/Hyprland \ + --suffix PATH : ${lib.makeBinPath [ + stdenv.cc + binutils + pciutils + ]} + ''} ''; passthru.providedSessions = ["hyprland"]; diff --git a/nix/overlays.nix b/nix/overlays.nix index 68c196d9..c216ff53 100644 --- a/nix/overlays.nix +++ b/nix/overlays.nix @@ -38,6 +38,7 @@ in { udis86 = final.udis86-hyprland; # explicit override until decided on breaking change of the name inherit date; }; + hyprland-unwrapped = final.hyprland.override {wrapRuntimeDeps = false;}; hyprland-debug = final.hyprland.override {debug = true;}; hyprland-legacy-renderer = final.hyprland.override {legacyRenderer = true;}; hyprland-nvidia = |