diff options
Diffstat (limited to 'pkgs/tools/X11')
-rw-r--r-- | pkgs/tools/X11/nx-libs/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/X11/xob/default.nix | 20 |
2 files changed, 20 insertions, 11 deletions
diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index 022111e4b3141..ed28cfbb8d871 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo +{ lib, stdenv, autoconf, automake, fetchFromGitHub, fetchpatch +, libgcc, libjpeg_turbo , libpng, libtool, libxml2, pkg-config, which, xorg , libtirpc }: @@ -12,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-qVOdD85sBMxKYx1cSLAGKeODsKKAm9UPBmYzPBbBOzQ="; }; + patches = [ + (fetchpatch { + name = "binutils-2.36.patch"; + url = "https://github.com/ArcticaProject/nx-libs/commit/605a266911b50ababbb3f8a8b224efb42743379c.patch"; + sha256 = "sha256-kk5ms3i0PrHL74I4OlsqDrdDcCJ0us03cQcBy4zjAoQ="; + }) + ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config which xorg.gccmakedep xorg.imake ]; buildInputs = [ libgcc libjpeg_turbo libpng libxml2 xorg.fontutil diff --git a/pkgs/tools/X11/xob/default.nix b/pkgs/tools/X11/xob/default.nix index 754904449efa1..71e50248df979 100644 --- a/pkgs/tools/X11/xob/default.nix +++ b/pkgs/tools/X11/xob/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "xob"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "florentc"; repo = pname; rev = "v${version}"; - sha256 = "0jbj61adwrpscfaadjman4hbyxhxv3ac8b4d88d623samx6kbvkk"; + sha256 = "1x4aafiyd9k4y8cmvn7rgfif3g5s5hhlbj5nz71qsyqg21nn7hrw"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorg.libX11 libconfig ]; + buildInputs = [ xorg.libX11 xorg.libXrender libconfig ]; makeFlags = [ "prefix=$(out)" ]; @@ -20,16 +20,16 @@ stdenv.mkDerivation rec { description = "A lightweight overlay bar for the X Window System"; longDescription = '' A lightweight configurable overlay volume/backlight/progress/anything bar - for the X Window System. Each time a new value is read on the standard - input, it is displayed as a tv-like bar over other windows. It then - vanishes after a configurable amount of time. A value followed by a bang - '!' is displayed using an alternate color to account for special states - (e.g. muted audio). There is also support for overflows (when the value - exceeds the maximum). + for the X Window System (and Wayland compositors with XWayland). Each + time a new value is read on the standard input, it is displayed as a + tv-like bar over other windows. It then vanishes after a configurable + amount of time. A value followed by a bang '!' is displayed using an + alternate color to account for special states (e.g. muted audio). There + is also support for overflows (when the value exceeds the maximum). ''; inherit (src.meta) homepage; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ florentc ]; }; } |