diff options
| author | Cole Mickens <cole.mickens@gmail.com> | 2019-05-04 18:23:17 -0700 |
|---|---|---|
| committer | Cole Mickens <cole.mickens@gmail.com> | 2019-05-23 17:47:17 -0700 |
| commit | fd71b69f03d66818a9c1fe6ba270174af96cf425 (patch) | |
| tree | 239cea0ea888ab20caf851d14d123a018e6ac0e9 /pkgs/sway | |
| parent | d9d8c56707930a98aefa76007d9c5a594ae87fa7 (diff) | |
updates
Diffstat (limited to 'pkgs/sway')
| -rw-r--r-- | pkgs/sway/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/sway/load-configuration-from-etc.patch | 43 | ||||
| -rw-r--r-- | pkgs/sway/metadata.nix | 6 |
3 files changed, 53 insertions, 4 deletions
diff --git a/pkgs/sway/default.nix b/pkgs/sway/default.nix index 491c862..35dc148 100644 --- a/pkgs/sway/default.nix +++ b/pkgs/sway/default.nix @@ -5,6 +5,7 @@ , libglvnd , pango, cairo, libinput, libcap, pam, gdk_pixbuf , wlroots, wayland-protocols +, libGLU_combined }: let @@ -13,7 +14,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "sway"; - version = "1.0"; + version = metadata.rev; src = fetchFromGitHub { owner = "swaywm"; @@ -24,8 +25,13 @@ stdenv.mkDerivation rec { patches = [ ./sway-config-no-nix-store-references.patch + ./load-configuration-from-etc.patch ]; + postPatch = '' + sed -iE "0,/version: '.*',/ s//version: '${version}',/" meson.build + ''; + nativeBuildInputs = [ pkgconfig meson ninja scdoc ]; buildInputs = [ diff --git a/pkgs/sway/load-configuration-from-etc.patch b/pkgs/sway/load-configuration-from-etc.patch new file mode 100644 index 0000000..ba88368 --- /dev/null +++ b/pkgs/sway/load-configuration-from-etc.patch @@ -0,0 +1,43 @@ +From 26f9c65ef037892977a824f0d7d7111066856b53 Mon Sep 17 00:00:00 2001 +From: Michael Weiss <dev.primeos@gmail.com> +Date: Sat, 27 Apr 2019 14:26:16 +0200 +Subject: [PATCH] Load configs from /etc but fallback to /nix/store + +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 +Sway work out-of-the-box with the default configuration on non NixOS +systems. +--- + meson.build | 3 ++- + sway/config.c | 1 + + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 02b5d606..c03a9c0f 100644 +--- a/meson.build ++++ b/meson.build +@@ -129,7 +129,8 @@ if scdoc.found() + endforeach + endif + +-add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c') ++add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c') ++add_project_arguments('-DNIX_SYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c') + + version = '"@0@"'.format(meson.project_version()) + if git.found() +diff --git a/sway/config.c b/sway/config.c +index 4cd21bbc..dd855753 100644 +--- a/sway/config.c ++++ b/sway/config.c +@@ -317,6 +317,7 @@ static char *get_config_path(void) { + "$XDG_CONFIG_HOME/i3/config", + SYSCONFDIR "/sway/config", + SYSCONFDIR "/i3/config", ++ NIX_SYSCONFDIR "/sway/config", + }; + + char *config_home = getenv("XDG_CONFIG_HOME"); +-- +2.19.2 + diff --git a/pkgs/sway/metadata.nix b/pkgs/sway/metadata.nix index 0765097..ffcced9 100644 --- a/pkgs/sway/metadata.nix +++ b/pkgs/sway/metadata.nix @@ -1,5 +1,5 @@ { - rev = "3b3e0560beb9a44f038736fd4c344052fdfe3f81"; - sha256 = "15l4gck4wsps884x0vbx6hlwxfxx857gha99w0pvdk0b84yfxap5"; - revdate = "2019-04-28T18:07:47Z"; + rev = "00cffb8e20d4bb800134f26dcda8a01afa4467d2"; + sha256 = "0gayimaw6rl45d4bkry5k9nj6fdxnsz4fjjbiwyzv1rfzzbj1cr7"; + revdate = "2019-05-22T19:33:10Z"; } |