diff options
| author | Patrick Hilhorst <git@hilhorst.be> | 2018-10-23 20:34:59 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2018-10-23 20:34:59 +0200 |
| commit | d8d8a0ba14a7be1aa36bcbdf66b7f2cd9df9d3ff (patch) | |
| tree | 3aaa7981d048f54fa24c0a865b7b8892e1d74068 | |
| parent | 0db57307e6dcafcf1298079dc337eb82daaf279c (diff) | |
| download | nixlib-d8d8a0ba14a7be1aa36bcbdf66b7f2cd9df9d3ff.tar nixlib-d8d8a0ba14a7be1aa36bcbdf66b7f2cd9df9d3ff.tar.gz nixlib-d8d8a0ba14a7be1aa36bcbdf66b7f2cd9df9d3ff.tar.bz2 nixlib-d8d8a0ba14a7be1aa36bcbdf66b7f2cd9df9d3ff.tar.lz nixlib-d8d8a0ba14a7be1aa36bcbdf66b7f2cd9df9d3ff.tar.xz nixlib-d8d8a0ba14a7be1aa36bcbdf66b7f2cd9df9d3ff.tar.zst nixlib-d8d8a0ba14a7be1aa36bcbdf66b7f2cd9df9d3ff.zip | |
sway-beta: init at 1.0-beta1 (#48829)
* sway-beta: init at 1.0-beta1 * sway, sway-beta: use https url
| -rw-r--r-- | pkgs/applications/window-managers/sway/beta.nix | 43 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/sway/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 46 insertions, 1 deletions
diff --git a/pkgs/applications/window-managers/sway/beta.nix b/pkgs/applications/window-managers/sway/beta.nix new file mode 100644 index 000000000000..5aebb7ed8dd1 --- /dev/null +++ b/pkgs/applications/window-managers/sway/beta.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub +, meson, ninja +, pkgconfig, scdoc +, wayland, libxkbcommon, pcre, json_c, dbus +, pango, cairo, libinput, libcap, pam, gdk_pixbuf +, wlroots, wayland-protocols +, buildDocs ? true +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "sway"; + version = "1.0-beta.1"; + + src = fetchFromGitHub { + owner = "swaywm"; + repo = "sway"; + rev = version; + sha256 = "0h9kgrg9mh2acks63z72bw3lwff32pf2nb4i7i5xhd9i6l4gfnqa"; + }; + + nativeBuildInputs = [ + pkgconfig meson ninja + ] ++ stdenv.lib.optional buildDocs scdoc; + + buildInputs = [ + wayland libxkbcommon pcre json_c dbus + pango cairo libinput libcap pam gdk_pixbuf + wlroots wayland-protocols + ]; + + enableParallelBuilding = true; + + mesonFlags = "-Dsway-version=${version}"; + + 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 ]; # Trying to keep it up-to-date. + }; +} diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 50614534f8e7..fb30f0073bfd 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "i3-compatible window manager for Wayland"; - homepage = http://swaywm.org; + homepage = https://swaywm.org; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27175da249c3..2355c2085752 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17199,7 +17199,9 @@ with pkgs; wlroots = callPackage ../development/libraries/wlroots { }; rootston = wlroots.bin; orbment = callPackage ../applications/window-managers/orbment { }; + sway = callPackage ../applications/window-managers/sway { }; + sway-beta = callPackage ../applications/window-managers/sway/beta.nix { }; velox = callPackage ../applications/window-managers/velox { stConf = config.st.conf or null; |