From ce072638e9d86aac15c5ff4c6dd777b2894af422 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Thu, 7 Mar 2024 10:59:24 +0200 Subject: [PATCH] Nix: use propagatedBuildInputs instead of wrapping This way, users that want to wrap Hyprland themselves won't have the issues of double-wrapping. --- nix/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 6062a215..66ea53a6 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -93,6 +93,13 @@ 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" @@ -132,14 +139,6 @@ 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"];