suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

sway-beta: 1.0-rc5 -> 1.0

Browse Source
This commit is contained in:
Michael Weiss 2019-03-11 16:44:44 +01:00
parent 7f43089999
commit eb2a26f5c6
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub, fetchpatch
, meson, ninja , meson, ninja
, pkgconfig, scdoc , pkgconfig, scdoc
, wayland, libxkbcommon, pcre, json_c, dbus, libevdev , wayland, libxkbcommon, pcre, json_c, dbus, libevdev
@ -10,17 +10,25 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "sway"; pname = "sway";
version = "1.0-rc5"; version = "1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "swaywm"; owner = "swaywm";
repo = "sway"; repo = "sway";
rev = version; rev = version;
sha256 = "1jkacibmxy9rpq5mxnq7bkwcy0c592zk4vf20j5qbbljp9h7c87i"; sha256 = "09cndc2nl39d3l7g5634xp0pxcz60pvc5277mfw89r22mh0j78rx";
};
# TODO: The following patch introduced a compiler warning which leads to a
# build failure (we'll revert it for now as this patch is not supposed to
# change any functionality):
patch-remove-unused-functions = fetchpatch {
url = "https://github.com/swaywm/sway/commit/2b70e8518b7327d29eec4f9593e9b8f4238cebfe.patch";
sha256 = "1bq1i8dzxwckahzna6s9swvhpj1c1ics14pc1f1jcxwya50lk1rz";
}; };
postPatch = '' postPatch = ''
sed -iE "s/version: '1.0',/version: '${version}',/" meson.build patch -p1 --reverse < ${patch-remove-unused-functions}
''; '';
nativeBuildInputs = [ nativeBuildInputs = [