3
0
Fork 0
forked from mirrors/nixpkgs

wdisplays: 1.0 -> 2021-04-03

I just realized that the original repository disappeared, so I decided
switch to a fork[1] for now. Also, I changed the following things:

* The project got relicensed[2] to `gpl3Plus`. Unfortunately the tags are
  gone, but it seems as this has happened after the 1.0 release, so no
  problem for us.

* The patch for sway 1.5[3] got merged into the fork, so it doesn't have
  to be applied here.

* Decided to go for `master` here for now. First of all there are no
  tags anymore, also there are a few fixes on `master` now.

* Compared the new source with the old 1.0 tarball via `diff -r`. Even
  though most of the changes were written by the original author on top
  of 1.0, I did a diff against everything from 1.0 and didn't find any
  issues. Also, `luispabon` doesn't seem to be a throw-away account so
  I'd say that using this fork for now is fine.

[1] https://github.com/luispabon/wdisplays
[2] 69564522bc
[3] 5198a9c94b
This commit is contained in:
Maximilian Bosch 2021-04-09 11:04:11 +02:00
parent 7f03c36c6e
commit 569a030d28
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E

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;
}; };
} }