diff options
Diffstat (limited to 'pkgs/applications/window-managers/sway/default.nix')
| -rw-r--r-- | pkgs/applications/window-managers/sway/default.nix | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 8267c0573ea5..782bd360d730 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -22,27 +22,24 @@ stdenv.mkDerivation rec { }; patches = [ - ./sway-config-no-nix-store-references.patch ./load-configuration-from-etc.patch (substituteAll { src = ./fix-paths.patch; inherit swaybg; }) + ] ++ lib.optionals (!isNixOS) [ + # References to /nix/store/... will get GC'ed which causes problems when + # copying the default configuration: + ./sway-config-no-nix-store-references.patch + ] ++ lib.optionals isNixOS [ + # Use /run/current-system/sw/share and /etc instead of /nix/store + # references: + ./sway-config-nixos-paths.patch ]; - postPatch = lib.optionalString isNixOS '' - echo -e '\ninclude /etc/sway/config.d/*' >> config.in - ''; - - strictDeps = true; - - # Pkg-config binary for machine MachineChoice.BUILD not found. Giving up. - # has to be in both depsBuildBuild and nativeBuildInputs - depsBuildBuild = [ pkg-config scdoc ]; - nativeBuildInputs = [ - meson ninja pkg-config wayland-scanner + meson ninja pkg-config wayland-scanner scdoc ]; buildInputs = [ @@ -53,7 +50,6 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Ddefault-wallpaper=false" "-Dsd-bus-provider=libsystemd" ] ++ lib.optional (!enableXWayland) "-Dxwayland=disabled" |