Merge pull request #118892 from Ma27/wdisplays-src

wdisplays: 1.0 -> 2021-04-03
This commit is contained in:
Maximilian Bosch 2021-04-11 16:24:06 +02:00 committed by GitHub
commit 126508fdd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,36 +1,25 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, epoxy, wayland, wrapGAppsHook { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, epoxy, wayland, wrapGAppsHook }:
, fetchpatch
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wdisplays"; pname = "wdisplays";
version = "1.0"; version = "unstable-2021-04-03";
nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ];
buildInputs = [ gtk3 epoxy wayland ]; buildInputs = [ gtk3 epoxy wayland ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cyclopsian"; owner = "luispabon";
repo = "wdisplays"; repo = "wdisplays";
rev = version; rev = "7f2eac0d2aa81b5f495da7950fd5a94683f7868e";
sha256 = "1xhgrcihja2i7yg54ghbwr1v6kf8jnsfcp364yb97vkxskc4y21y"; sha256 = "sha256-cOF3+T34zPro58maWUouGG+vlLm2C5NfcH7PZhSvApE=";
}; };
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 = with lib; { meta = with lib; {
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/luispabon/wdisplays";
maintainers = with lib.maintainers; [ lheckemann ma27 ]; maintainers = with maintainers; [ lheckemann ma27 ];
license = lib.licenses.mit; license = licenses.gpl3Plus;
platforms = lib.platforms.linux; platforms = platforms.linux;
}; };
} }