wdisplays: fix startup on sway 1.5
Starting `wdisplays` on a NixOS 20.09 with `sway-1.5` breaks with the following output: ``` (wdisplays:28400): Gtk-WARNING **: 10:26:38.619: Could not load a pixbuf from /org/gtk/libgtk/theme/Adwaita/assets/bullet-symbolic.svg. This may indicate that pixbuf loaders or the mime database could not be found. Gdk-Message: 10:26:38.752: Error reading events from display: Success ``` The first two warnings can be fixed by adding `wrapGAppsHook`. The last error is an upstream bug that can be fixed by applying the patch from a pending PR[1]. [1] https://github.com/cyclopsian/wdisplays/pull/20
This commit is contained in:
parent
56456fef75
commit
0a21d06682
@ -1,10 +1,12 @@
|
|||||||
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gtk3, epoxy, wayland }:
|
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gtk3, epoxy, wayland, wrapGAppsHook
|
||||||
|
, fetchpatch
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "wdisplays";
|
pname = "wdisplays";
|
||||||
version = "1.0";
|
version = "1.0";
|
||||||
|
|
||||||
nativeBuildInputs = [ meson ninja pkgconfig ];
|
nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook ];
|
||||||
|
|
||||||
buildInputs = [ gtk3 epoxy wayland ];
|
buildInputs = [ gtk3 epoxy wayland ];
|
||||||
|
|
||||||
@ -15,6 +17,15 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "1xhgrcihja2i7yg54ghbwr1v6kf8jnsfcp364yb97vkxskc4y21y";
|
sha256 = "1xhgrcihja2i7yg54ghbwr1v6kf8jnsfcp364yb97vkxskc4y21y";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Fixes `Gdk-Message: 10:26:38.752: Error reading events from display: Success`
|
||||||
|
# https://github.com/cyclopsian/wdisplays/pull/20
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/cyclopsian/wdisplays/commit/5198a9c94b40ff157c284df413be5402f1b75118.patch";
|
||||||
|
sha256 = "1xwphyn0ksf8isy9dz3mfdhmsz4jv02870qz5615zs7aqqfcwn85";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
meta = let inherit (stdenv) lib; in {
|
meta = let inherit (stdenv) lib; in {
|
||||||
description = "A graphical application for configuring displays in Wayland compositors";
|
description = "A graphical application for configuring displays in Wayland compositors";
|
||||||
homepage = "https://github.com/cyclopsian/wdisplays";
|
homepage = "https://github.com/cyclopsian/wdisplays";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user