mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 21:21:06 +00:00
sway-beta: 1.0-rc5 -> 1.0
This commit is contained in:
parent
7f43089999
commit
eb2a26f5c6
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub
|
||||
{ stdenv, fetchFromGitHub, fetchpatch
|
||||
, meson, ninja
|
||||
, pkgconfig, scdoc
|
||||
, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
|
||||
|
@ -10,17 +10,25 @@
|
|||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "sway";
|
||||
version = "1.0-rc5";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swaywm";
|
||||
repo = "sway";
|
||||
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 = ''
|
||||
sed -iE "s/version: '1.0',/version: '${version}',/" meson.build
|
||||
patch -p1 --reverse < ${patch-remove-unused-functions}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
Loading…
Reference in a new issue