public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #55117 from primeos/sway

Browse Source 
sway-beta: 1.0-beta.2 -> 1.0-rc1
This commit is contained in:
Michael Weiss 2019-02-03 15:57:26 +01:00 committed by GitHub
commit 07b70bd188
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/programs/sway-beta.nix
View File

@ -60,10 +60,11 @@ in {
extraPackages = mkOption { extraPackages = mkOption {
type = with types; listOf package; type = with types; listOf package;
default = with pkgs; [ default = with pkgs; [
swaylock swayidle
xwayland rxvt_unicode dmenu xwayland rxvt_unicode dmenu
]; ];
defaultText = literalExample '' defaultText = literalExample ''
with pkgs; [ xwayland rxvt_unicode dmenu ]; with pkgs; [ swaylock swayidle xwayland rxvt_unicode dmenu ];
''; '';
example = literalExample '' example = literalExample ''
with pkgs; [ with pkgs; [

13
pkgs/applications/window-managers/sway/beta.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, meson, ninja , meson, ninja
, pkgconfig, scdoc , pkgconfig, scdoc
, wayland, libxkbcommon, pcre, json_c, dbus , wayland, libxkbcommon, pcre, json_c, dbus, libevdev
, pango, cairo, libinput, libcap, pam, gdk_pixbuf , pango, cairo, libinput, libcap, pam, gdk_pixbuf
, wlroots, wayland-protocols , wlroots, wayland-protocols
, buildDocs ? true , buildDocs ? true
@ -10,13 +10,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "sway"; pname = "sway";
version = "1.0-beta.2"; version = "1.0-rc1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "swaywm"; owner = "swaywm";
repo = "sway"; repo = "sway";
rev = version; rev = version;
sha256 = "0f9rniwizbc3vzxdy6rc47749p6gczfbgfdy4r458134rbl551hw"; sha256 = "1zigx2yz0i91iz2r2l6csq33hscaybmaq1p19jgxrazms7z213mz";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -24,14 +24,17 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optional buildDocs scdoc; ] ++ stdenv.lib.optional buildDocs scdoc;
buildInputs = [ buildInputs = [
wayland libxkbcommon pcre json_c dbus wayland libxkbcommon pcre json_c dbus libevdev
pango cairo libinput libcap pam gdk_pixbuf pango cairo libinput libcap pam gdk_pixbuf
wlroots wayland-protocols wlroots wayland-protocols
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
mesonFlags = "-Dsway-version=${version}"; mesonFlags = [
"-Dsway-version=${version}" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled"
"-Dman-pages=enabled" "-Dtray=enabled"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "i3-compatible window manager for Wayland"; description = "i3-compatible window manager for Wayland";

14
pkgs/development/libraries/wlroots/default.nix
View File

@ -6,7 +6,7 @@
let let
pname = "wlroots"; pname = "wlroots";
version = "0.2"; version = "0.3";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -14,14 +14,9 @@ in stdenv.mkDerivation rec {
owner = "swaywm"; owner = "swaywm";
repo = "wlroots"; repo = "wlroots";
rev = version; rev = version;
sha256 = "0gfxawjlb736xl90zfv3n6zzf5n1cacgzflqi1zq1wn7wd3j6ppv"; sha256 = "1iz5lxpiba1lcmkz3hz56r8j6ra3535zgckazqshi4c364nx94zs";
}; };
postPatch = ''
substituteInPlace meson.build \
--replace "version: '0.1.0'" "version: '${version}.0'"
'';
# $out for the library, $bin for rootston, and $examples for the example # $out for the library, $bin for rootston, and $examples for the example
# programs (in examples) AND rootston # programs (in examples) AND rootston
outputs = [ "out" "bin" "examples" ]; outputs = [ "out" "bin" "examples" ];
@ -39,6 +34,11 @@ in stdenv.mkDerivation rec {
"-Dxcb-icccm=enabled" "-Dxcb-errors=enabled" "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled"
]; ];
postPatch = ''
# It happens from time to time that the version wasn't updated:
sed -iE "s/version: '[0-9]\.[0-9]\.[0-9]'/version: '${version}.0'/" meson.build
'';
postInstall = '' postInstall = ''
# Install rootston (the reference compositor) to $bin and $examples # Install rootston (the reference compositor) to $bin and $examples
for output in "$bin" "$examples"; do for output in "$bin" "$examples"; do