Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: da320dba12d7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 947219c33eaa
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 11, 2020

  1. 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

(cherry picked from commit 0a21d06)
    @Ma27
    Ma27 committed Sep 11, 2020
    Copy the full SHA
    947219c View commit details
Showing with 13 additions and 2 deletions.
  1. +13 −2 pkgs/tools/graphics/wdisplays/default.nix
15 changes: 13 additions & 2 deletions pkgs/tools/graphics/wdisplays/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {
pname = "wdisplays";
version = "1.0";

nativeBuildInputs = [ meson ninja pkgconfig ];
nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook ];

buildInputs = [ gtk3 epoxy wayland ];

@@ -15,6 +17,15 @@ stdenv.mkDerivation rec {
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 {
description = "A graphical application for configuring displays in Wayland compositors";
homepage = "https://github.com/cyclopsian/wdisplays";