b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

sway: 1.5.1 -> 1.6

Browse source 
Co-authored-by: Michael Weiss <dev.primeos@gmail.com>
This commit is contained in:
Patrick Hilhorst 2021-04-08 12:35:51 +02:00
parent c4976f3565
commit 91fad635f0
No known key found for this signature in database
GPG key ID: 3BB083304DADC0FF
2 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/window-managers/sway/default.nix
View file

@ -2,18 +2,18 @@
, meson, ninja, pkg-config, wayland, scdoc , meson, ninja, pkg-config, wayland, scdoc
, libxkbcommon, pcre, json_c, dbus, libevdev , libxkbcommon, pcre, json_c, dbus, libevdev
, pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg
, wlroots, wayland-protocols , wlroots, wayland-protocols, libdrm
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sway-unwrapped"; pname = "sway-unwrapped";
version = "1.5.1"; version = "1.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "swaywm"; owner = "swaywm";
repo = "sway"; repo = "sway";
rev = version; rev = version;
sha256 = "1xsa3h8zhf29p0mi90baxpr76jkd9pd1gr97ky8cnjbcs4isj9j0"; sha256 = "0vnplva11yafhbijrk68wy7pw0psn9jm0caaymswq1s951xsn1c8";
}; };
patches = [ patches = [
@ -33,11 +33,12 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
wayland libxkbcommon pcre json_c dbus libevdev wayland libxkbcommon pcre json_c dbus libevdev
pango cairo libinput libcap pam gdk-pixbuf librsvg pango cairo libinput libcap pam gdk-pixbuf librsvg
wlroots wayland-protocols wlroots wayland-protocols libdrm
]; ];
mesonFlags = [ mesonFlags = [
"-Ddefault-wallpaper=false" "-Ddefault-wallpaper=false"
"-Dsd-bus-provider=libsystemd"
]; ];
meta = with lib; { meta = with lib; {

38
pkgs/applications/window-managers/sway/load-configuration-from-etc.patch
View file

@ -1,22 +1,26 @@
From 26f9c65ef037892977a824f0d7d7111066856b53 Mon Sep 17 00:00:00 2001 From 92283df3acbffa5c1bb21f23cdd686113d905114 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com> From: Patrick Hilhorst <git@hilhorst.be>
Date: Sat, 27 Apr 2019 14:26:16 +0200 Date: Wed, 31 Mar 2021 21:14:13 +0200
Subject: [PATCH] Load configs from /etc but fallback to /nix/store Subject: [PATCH] Load configs from /etc but fallback to /nix/store
This change will load all configuration files from /etc, to make it easy This change will load all configuration files from /etc, to make it easy
to override them, but fallback to /nix/store/.../etc/sway/config to make to override them, but fallback to /nix/store/.../etc/sway/config to make
Sway work out-of-the-box with the default configuration on non NixOS Sway work out-of-the-box with the default configuration on non NixOS
systems. systems.
Original patch by Michael Weiss, updated for Sway 1.6 by Patrick Hilhorst
Co-authored-by: Michael Weiss <dev.primeos@gmail.com>
--- ---
meson.build | 3 ++- meson.build | 3 ++-
sway/config.c | 1 + sway/config.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-) 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 02b5d606..c03a9c0f 100644 index b7a29660..8ae8ceb3 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -129,7 +129,8 @@ if scdoc.found() @@ -164,7 +164,8 @@ if scdoc.found()
endforeach endforeach
endif endif
@ -25,18 +29,20 @@ index 02b5d606..c03a9c0f 100644
+add_project_arguments('-DNIX_SYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c') +add_project_arguments('-DNIX_SYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c')
version = '"@0@"'.format(meson.project_version()) version = '"@0@"'.format(meson.project_version())
if git.found() git = find_program('git', native: true, required: false)
diff --git a/sway/config.c b/sway/config.c diff --git a/sway/config.c b/sway/config.c
index 4cd21bbc..dd855753 100644 index 76b9ec08..fb5b51aa 100644
--- a/sway/config.c --- a/sway/config.c
+++ b/sway/config.c +++ b/sway/config.c
@@ -317,6 +317,7 @@ static char *get_config_path(void) { @@ -374,7 +374,8 @@ static char *get_config_path(void) {
"$XDG_CONFIG_HOME/i3/config", { .prefix = home, .config_folder = ".i3"},
SYSCONFDIR "/sway/config", { .prefix = config_home, .config_folder = "i3"},
SYSCONFDIR "/i3/config", { .prefix = SYSCONFDIR, .config_folder = "sway"},
+ NIX_SYSCONFDIR "/sway/config", - { .prefix = SYSCONFDIR, .config_folder = "i3"}
+ { .prefix = SYSCONFDIR, .config_folder = "i3"},
+ { .prefix = NIX_SYSCONFDIR, .config_folder = "sway"},
}; };
char *config_home = getenv("XDG_CONFIG_HOME"); size_t num_config_paths = sizeof(config_paths)/sizeof(config_paths[0]);
-- --
2.19.2 2.30.1