diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-03-16 17:16:21 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-03-16 22:36:36 +0000 |
commit | cb6d0ec12187e0c2c11b203f3d8fa62790628141 (patch) | |
tree | 0ca0fedc67d5676e89438cffa3e0865eee0962e4 /nixpkgs/pkgs/applications/window-managers/sway | |
parent | 4d83b8e578d3a0b78d2694921c944172b009036a (diff) | |
parent | da1a2b1eeafa66b4419b4f275396d8a731eccb61 (diff) | |
download | nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.gz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.bz2 nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.lz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.xz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.zst nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.zip |
Merge commit 'da1a2b1eeafa66b4419b4f275396d8a731eccb61'
Diffstat (limited to 'nixpkgs/pkgs/applications/window-managers/sway')
3 files changed, 52 insertions, 67 deletions
diff --git a/nixpkgs/pkgs/applications/window-managers/sway/beta.nix b/nixpkgs/pkgs/applications/window-managers/sway/beta.nix deleted file mode 100644 index 83c8e9328caf..000000000000 --- a/nixpkgs/pkgs/applications/window-managers/sway/beta.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchFromGitHub -, meson, ninja -, pkgconfig, scdoc -, wayland, libxkbcommon, pcre, json_c, dbus, libevdev -, pango, cairo, libinput, libcap, pam, gdk_pixbuf -, wlroots, wayland-protocols -, buildDocs ? true -}: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "sway"; - version = "1.0-rc5"; - - src = fetchFromGitHub { - owner = "swaywm"; - repo = "sway"; - rev = version; - sha256 = "1jkacibmxy9rpq5mxnq7bkwcy0c592zk4vf20j5qbbljp9h7c87i"; - }; - - postPatch = '' - sed -iE "s/version: '1.0',/version: '${version}',/" meson.build - ''; - - nativeBuildInputs = [ - pkgconfig meson ninja - ] ++ stdenv.lib.optional buildDocs scdoc; - - buildInputs = [ - wayland libxkbcommon pcre json_c dbus libevdev - pango cairo libinput libcap pam gdk_pixbuf - wlroots wayland-protocols - ]; - - enableParallelBuilding = true; - - mesonFlags = [ - "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" "-Dtray=enabled" - ] ++ stdenv.lib.optional buildDocs "-Dman-pages=enabled"; - - meta = with stdenv.lib; { - description = "i3-compatible window manager for Wayland"; - homepage = https://swaywm.org; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos synthetica ]; - }; -} diff --git a/nixpkgs/pkgs/applications/window-managers/sway/default.nix b/nixpkgs/pkgs/applications/window-managers/sway/default.nix index fb30f0073bfd..ad06b1ee832c 100644 --- a/nixpkgs/pkgs/applications/window-managers/sway/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/sway/default.nix @@ -1,40 +1,53 @@ -{ stdenv, fetchFromGitHub -, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl -, wayland, wlc, libxkbcommon, pcre, json_c, dbus -, pango, cairo, libinput, libcap, pam, gdk_pixbuf, libpthreadstubs -, libXdmcp -, buildDocs ? true +{ stdenv, fetchFromGitHub, fetchpatch +, meson, ninja +, pkgconfig, scdoc +, wayland, libxkbcommon, pcre, json_c, dbus, libevdev +, pango, cairo, libinput, libcap, pam, gdk_pixbuf +, wlroots, wayland-protocols }: stdenv.mkDerivation rec { - name = "sway-${version}"; - version = "0.15.2"; + name = "${pname}-${version}"; + pname = "sway"; + version = "1.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "1p9j5gv85lsgj4z28qja07dqyvqk41w6mlaflvvm9yxafx477g5n"; + sha256 = "09cndc2nl39d3l7g5634xp0pxcz60pvc5277mfw89r22mh0j78rx"; }; - nativeBuildInputs = [ - cmake pkgconfig - ] ++ stdenv.lib.optional buildDocs [ asciidoc libxslt docbook_xsl ]; + patches = [ + # Fix for a compiler warning that causes a build failure + # (see https://github.com/swaywm/sway/issues/3862): + (fetchpatch { + url = "https://github.com/swaywm/sway/commit/bcde298a719f60b9913133dbd2a169dedbc8dd7d.patch"; + sha256 = "0r583nmqvq43ib93yv6flw8pj833v32lbs0q0xld56s3rnzvvdcp"; + }) + ./sway-config-no-nix-store-references.patch + ]; + + nativeBuildInputs = [ pkgconfig meson ninja scdoc ]; + buildInputs = [ - wayland wlc libxkbcommon pcre json_c dbus - pango cairo libinput libcap pam gdk_pixbuf libpthreadstubs - libXdmcp + wayland libxkbcommon pcre json_c dbus libevdev + pango cairo libinput libcap pam gdk_pixbuf + wlroots wayland-protocols ]; enableParallelBuilding = true; - cmakeFlags = "-DVERSION=${version} -DLD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib"; + mesonFlags = [ + "-Ddefault-wallpaper=false" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" + "-Dtray=enabled" "-Dman-pages=enabled" + ]; meta = with stdenv.lib; { - description = "i3-compatible window manager for Wayland"; + description = "i3-compatible tiling Wayland compositor"; homepage = https://swaywm.org; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date. + maintainers = with maintainers; [ primeos synthetica ]; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch b/nixpkgs/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch new file mode 100644 index 000000000000..009c12959430 --- /dev/null +++ b/nixpkgs/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch @@ -0,0 +1,21 @@ +diff --git a/config.in b/config.in +--- a/config.in ++++ b/config.in +@@ -21,8 +21,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 ++#output * bg ~/.config/sway/backgrounds/Sway_Wallpaper_Blue_1920x1080.png fill + # + # Example configuration: + # +@@ -213,5 +213,3 @@ bar { + inactive_workspace #32323200 #32323200 #5c5c5c + } + } +- +-include @sysconfdir@/sway/config.d/* + |