diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2021-05-14 16:34:18 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2021-05-14 16:37:11 +0200 |
commit | 83265a850dea2824456db1debf902520db1a536d (patch) | |
tree | 3841fd02fc084f7699e4223b17a5489d60ca597e /pkgs/applications/window-managers | |
parent | a96c617beaf727725773df2a07dc7744d57be071 (diff) | |
download | nixpkgs-83265a850dea2824456db1debf902520db1a536d.tar nixpkgs-83265a850dea2824456db1debf902520db1a536d.tar.gz nixpkgs-83265a850dea2824456db1debf902520db1a536d.tar.bz2 nixpkgs-83265a850dea2824456db1debf902520db1a536d.tar.lz nixpkgs-83265a850dea2824456db1debf902520db1a536d.tar.xz nixpkgs-83265a850dea2824456db1debf902520db1a536d.tar.zst nixpkgs-83265a850dea2824456db1debf902520db1a536d.zip |
sway: Install the wallpapers by default and use them on NixOS
Size impact: $ du -sh $(nix-build -A sway-unwrapped) 5.9M /nix/store/d07zcpybgpdj8xhn9n4qb04lgm453ia1-sway-unwrapped-1.6 nix@sessel:/var/tmp/michael/nixpkgs$ du -sh $(nix-build -A sway-unwrapped)/share/backgrounds 4.9M /nix/store/d07zcpybgpdj8xhn9n4qb04lgm453ia1-sway-unwrapped-1.6/share/backgrounds
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r-- | pkgs/applications/window-managers/sway/default.nix | 14 | ||||
-rw-r--r-- | pkgs/applications/window-managers/sway/sway-config-nixos-paths.patch | 21 |
2 files changed, 29 insertions, 6 deletions
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 03abea94a2e..24c70b37674 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -20,19 +20,22 @@ 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 - ''; - nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ]; @@ -44,7 +47,6 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Ddefault-wallpaper=false" "-Dsd-bus-provider=libsystemd" ]; diff --git a/pkgs/applications/window-managers/sway/sway-config-nixos-paths.patch b/pkgs/applications/window-managers/sway/sway-config-nixos-paths.patch new file mode 100644 index 00000000000..bbb0f722b8b --- /dev/null +++ b/pkgs/applications/window-managers/sway/sway-config-nixos-paths.patch @@ -0,0 +1,21 @@ +diff --git a/config.in b/config.in +index 08703bef..f3872730 100644 +--- a/config.in ++++ b/config.in +@@ -22,8 +22,8 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec -- + + ### Output configuration + # +-# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/) +-output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill ++# Default wallpaper (more resolutions are available in /run/current-system/sw/share/backgrounds/sway/) ++output * bg /run/current-system/sw/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill + # + # Example configuration: + # +@@ -214,4 +214,4 @@ bar { + } + } + +-include @sysconfdir@/sway/config.d/* ++include /etc/sway/config.d/* |