diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-10-19 16:28:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-19 16:28:12 +0100 |
| commit | e09f070951aab4959d84d300300fc7e9bd5a4b02 (patch) | |
| tree | 9fe91f12095f9137509476a83c326916f772cfea | |
| parent | 9d82aa696ccc80f059197c49ae79fe92808ceed7 (diff) | |
| parent | f8085cb1dd8f86253e57330371f00147a98ac3ae (diff) | |
| download | nixlib-e09f070951aab4959d84d300300fc7e9bd5a4b02.tar nixlib-e09f070951aab4959d84d300300fc7e9bd5a4b02.tar.gz nixlib-e09f070951aab4959d84d300300fc7e9bd5a4b02.tar.bz2 nixlib-e09f070951aab4959d84d300300fc7e9bd5a4b02.tar.lz nixlib-e09f070951aab4959d84d300300fc7e9bd5a4b02.tar.xz nixlib-e09f070951aab4959d84d300300fc7e9bd5a4b02.tar.zst nixlib-e09f070951aab4959d84d300300fc7e9bd5a4b02.zip | |
Merge pull request #30493 from disassembler/sway
sway: 0.13.0 -> 0.14.0
| -rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/programs/sway.nix | 19 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/sway/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/wlc/default.nix | 4 |
4 files changed, 25 insertions, 7 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a8cb957ffe21..e8fecafb2c83 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -99,6 +99,7 @@ ./programs/ssh.nix ./programs/ssmtp.nix ./programs/sysdig.nix + ./programs/sway.nix ./programs/thefuck.nix ./programs/tmux.nix ./programs/venus.nix diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix new file mode 100644 index 000000000000..fc8a06d106ae --- /dev/null +++ b/nixos/modules/programs/sway.nix @@ -0,0 +1,19 @@ +{ config, pkgs, lib, ... }: + +with lib; +{ + options.programs.sway.enable = mkEnableOption "sway"; + + config = mkIf config.programs.sway.enable { + environment.systemPackages = [ pkgs.sway pkgs.xwayland ]; + security.wrappers.sway = { + source = "${pkgs.sway}/bin/sway"; + capabilities = "cap_sys_ptrace,cap_sys_tty_config=eip"; + owner = "root"; + group = "sway"; + permissions = "u+rx,g+rx"; + }; + + users.extraGroups.sway = {}; + }; +} diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 2c94f7f6fecc..8de87d2e8fd6 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -5,17 +5,15 @@ , libXdmcp }: -let - # TODO: Sway 0.14.0 with wlc 0.0.10 segfaults - version = "0.13.0"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "sway-${version}"; + version = "0.14.0"; src = fetchFromGitHub { owner = "Sircmpwn"; repo = "sway"; rev = "${version}"; - sha256 = "1vgk4rl51nx66yzpwg4yhnbj7wc30k5q0hh5lf8y0i1nvpal0p3q"; + sha256 = "1l8v9cdzd44bm4q71d47vqg6933b8j42q1a61r362vz2la1rcpq2"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index c67070094de6..95a8603e08ca 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { name = "wlc-${version}"; - version = "0.0.9"; # 0.0.10 currently causes segfaults + version = "0.0.10"; src = fetchFromGitHub { owner = "Cloudef"; repo = "wlc"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg"; + sha256 = "09kvwhrpgkxlagn9lgqxc80jbg56djn29a6z0n6h0dsm90ysyb2k"; }; nativeBuildInputs = [ cmake pkgconfig ]; |