git.iko.soy/typeable/nixpkgs
on master help sign in
sway-beta: 1.0-rc5 -> 1.0
commiteb2a26f5c61e8cb705bc4a9579502002ebe7ba0c authorMichael Weiss <dev.primeos@gmail.com> dateMon 11 Mar 2019, 16:44 (8 years ago) parent7f43089
1 file changed+12−4
pkgs/applications/window-managers/sway/beta.nix+12−4
pkgs/applications/window-managers/sway/beta.nix+12−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub
1+{ stdenv, fetchFromGitHub, fetchpatch
22, meson, ninja
33, pkgconfig, scdoc
44, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
@@ -10,17 +10,25 @@
1010stdenv.mkDerivation rec {
1111 name = "${pname}-${version}";
1212 pname = "sway";
13− version = "1.0-rc5";
13+ version = "1.0";
1414
1515 src = fetchFromGitHub {
1616 owner = "swaywm";
1717 repo = "sway";
1818 rev = version;
19− sha256 = "1jkacibmxy9rpq5mxnq7bkwcy0c592zk4vf20j5qbbljp9h7c87i";
19+ sha256 = "09cndc2nl39d3l7g5634xp0pxcz60pvc5277mfw89r22mh0j78rx";
20+ };
21+
22+ # TODO: The following patch introduced a compiler warning which leads to a
23+ # build failure (we'll revert it for now as this patch is not supposed to
24+ # change any functionality):
25+ patch-remove-unused-functions = fetchpatch {
26+ url = "https://github.com/swaywm/sway/commit/2b70e8518b7327d29eec4f9593e9b8f4238cebfe.patch";
27+ sha256 = "1bq1i8dzxwckahzna6s9swvhpj1c1ics14pc1f1jcxwya50lk1rz";
2028 };
2129
2230 postPatch = ''
23− sed -iE "s/version: '1.0',/version: '${version}',/" meson.build
31+ patch -p1 --reverse < ${patch-remove-unused-functions}
2432 '';
2533
2634 nativeBuildInputs = [