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

Merge pull request #62608 from Synthetica9/sway11

Browse Source 
wlroots: 0.5 -> 0.6
sway: 1.0 -> 1.1.1
This commit is contained in:
Michael Weiss 2019-06-04 20:07:30 +02:00 committed by GitHub
commit aa0baea2c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/applications/window-managers/sway/default.nix
View File

@ -1,35 +1,28 @@
{ stdenv, fetchFromGitHub, fetchpatch { stdenv, fetchFromGitHub, makeWrapper
, meson, ninja , meson, ninja
, pkgconfig, scdoc , pkgconfig, scdoc
, wayland, libxkbcommon, pcre, json_c, dbus, libevdev , 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, swaybg
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "sway"; pname = "sway";
version = "1.0"; version = "1.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "swaywm"; owner = "swaywm";
repo = "sway"; repo = "sway";
rev = version; rev = version;
sha256 = "09cndc2nl39d3l7g5634xp0pxcz60pvc5277mfw89r22mh0j78rx"; sha256 = "0yhn9zdg9mzfhn97c440lk3pw6122nrhx0is5sqmvgr6p814f776";
}; };
patches = [ 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 ./sway-config-no-nix-store-references.patch
./load-configuration-from-etc.patch ./load-configuration-from-etc.patch
]; ];
nativeBuildInputs = [ pkgconfig meson ninja scdoc ]; nativeBuildInputs = [ pkgconfig meson ninja scdoc makeWrapper ];
buildInputs = [ buildInputs = [
wayland libxkbcommon pcre json_c dbus libevdev wayland libxkbcommon pcre json_c dbus libevdev
@ -44,6 +37,14 @@ stdenv.mkDerivation rec {
"-Dtray=enabled" "-Dman-pages=enabled" "-Dtray=enabled" "-Dman-pages=enabled"
]; ];
postInstall = ''
wrapProgram $out/bin/sway --prefix PATH : "${swaybg}/bin"
'';
postPatch = ''
sed -i "s/version: '1.0'/version: '${version}'/" meson.build
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "i3-compatible tiling Wayland compositor"; description = "i3-compatible tiling Wayland compositor";
homepage = https://swaywm.org; homepage = https://swaywm.org;

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

@ -4,17 +4,15 @@
, libpng, ffmpeg_4 , libpng, ffmpeg_4
}: }:
let stdenv.mkDerivation rec {
pname = "wlroots"; pname = "wlroots";
version = "0.5.0"; version = "0.6.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "swaywm"; owner = "swaywm";
repo = "wlroots"; repo = "wlroots";
rev = version; rev = version;
sha256 = "1phiidyddzgaxy4gbqwmykxn0y8za6y5mp66l9dpd9i6fml153yq"; sha256 = "1rdcmll5b8w242n6yfjpsaprq280ck2jmbz46dxndhignxgda7k4";
}; };
# $out for the library, $bin for rootston, and $examples for the example # $out for the library, $bin for rootston, and $examples for the example