aland/nixpkgs-odroid-hc4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

Browse source 
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 • committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

42
pkgs/tools/audio/pasystray/default.nix Normal file
View file

@ -0,0 +1,42 @@
{ lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook
, gnome, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio
, xlibsWrapper, gsettings-desktop-schemas
}:
stdenv.mkDerivation rec {
pname = "pasystray";
version = "0.7.1";
src = fetchFromGitHub {
owner = "christophgysin";
repo = "pasystray";
rev = "${pname}-${version}";
sha256 = "0xx1bm9kimgq11a359ikabdndqg5q54pn1d1dyyjnrj0s41168fk";
};
patches = [
# https://github.com/christophgysin/pasystray/issues/90#issuecomment-306190701
./fix-wayland.patch
# https://github.com/christophgysin/pasystray/issues/98
(fetchpatch {
url = "https://sources.debian.org/data/main/p/pasystray/0.7.1-1/debian/patches/0001-Build-against-ayatana-appindicator.patch";
sha256 = "0hijphrf52n2zfwdnrmxlp3a7iwznnkb79awvpzplz0ia2lqywpw";
})
];
nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ];
buildInputs = [
gnome.adwaita-icon-theme
avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper
gsettings-desktop-schemas
];
meta = with lib; {
description = "PulseAudio system tray";
homepage = "https://github.com/christophgysin/pasystray";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ exlevan kamilchm ];
platforms = platforms.linux;
};
}

34
pkgs/tools/audio/pasystray/fix-wayland.patch Normal file
View file

@ -0,0 +1,34 @@
--- a/src/x11-property.c
+++ b/src/x11-property.c
@@ -43,11 +43,15 @@ static Window window;
void x11_property_init()
{
display = gdk_x11_get_default_xdisplay();
+ if (!GDK_IS_X11_DISPLAY(display)) return;
+ Screen* scr = ScreenOfDisplay(display, 0);
+
window = RootWindow(display, 0);
}
void x11_property_set(const char* key, const char* value)
{
+ if (!GDK_IS_X11_DISPLAY(display)) return;
g_debug("[x11-property] setting '%s' to '%s'", key, value);
Atom atom = XInternAtom(display, key, False);
@@ -57,6 +61,7 @@ void x11_property_set(const char* key, c
void x11_property_del(const char* key)
{
+ if (!GDK_IS_X11_DISPLAY(display)) return;
g_debug("[x11-property] deleting '%s'", key);
Atom atom = XInternAtom(display, key, False);
@@ -65,6 +70,7 @@ void x11_property_del(const char* key)
char* x11_property_get(const char* key)
{
+ if (!GDK_IS_X11_DISPLAY(display)) return NULL;
Atom property = XInternAtom(display, key, False);
Atom actual_type;
int actual_format;