diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/X11')
13 files changed, 131 insertions, 47 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix index 91e067e7be71..2254cb4038e9 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.196"; + version = "1.198"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "0c79rycgpna8910as6blw3z3sajzzakz4qlvr6js2yr8zq2d0ylg"; + sha256 = "04ahnn8gi24x9kjz6q4nm6gswc4gcav87rvq9sajj4g2hkrxfn0c"; }; buildInputs = [ perl ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/devour/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/devour/default.nix new file mode 100644 index 000000000000..4f39c0a98904 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/devour/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, libX11 }: + +stdenv.mkDerivation rec { + pname = "devour"; + version = "12"; + + src = fetchFromGitHub { + owner = "salman-abedin"; + repo = "devour"; + rev = version; + sha256 = "1qq5l6d0fn8azg7sj7a4m2jsmhlpswl5793clcxs1p34vy4wb2lp"; + }; + + installPhase = '' + install -Dm555 -t $out/bin devour + ''; + + buildInputs = [ libX11 ]; + + meta = with stdenv.lib; { + description = "Devour hides your current window when launching an external program"; + longDescription = "Devour hides your current window before launching an external program and unhides it after quitting"; + homepage = "https://github.com/salman-abedin/devour"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ mazurel ]; + platforms = platforms.unix; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/find-cursor/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/find-cursor/default.nix new file mode 100644 index 000000000000..13f274577887 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/find-cursor/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, libX11, libXdamage, libXrender, libXcomposite, libXext, installShellFiles, git }: + +stdenv.mkDerivation rec { + pname = "find-cursor"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "arp242"; + repo = "find-cursor"; + rev = "v${version}"; + sha256 = "13lpcxklv9ayqapyk9pmwxkinhxah5hkr6n0jc2m5hm68nh220w1"; + }; + + nativeBuildInputs = [ installShellFiles git ]; + buildInputs = [ libX11 libXdamage libXrender libXcomposite libXext ]; + preInstall = "mkdir -p $out/share/man/man1"; + installFlags = "PREFIX=${placeholder "out"}"; + + meta = with stdenv.lib; { + description = "Simple XLib program to highlight the cursor position"; + homepage = "https://github.com/arp242/find-cursor"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.yanganto ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/grobi/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/grobi/default.nix index 111d064ad887..9d10dd478818 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/X11/grobi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/grobi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, fetchpatch }: buildGoModule rec { version = "0.6.0"; @@ -13,6 +13,14 @@ buildGoModule rec { vendorSha256 = "1ibwx5rbxkygfx78j3g364dmbwwa5b34qmzq3sqcbrsnv8rzrwvj"; + patches = [ + # fix failing test on go 1.15 + (fetchpatch { + url = "https://github.com/fd0/grobi/commit/176988ab087ff92d1408fbc454c77263457f3d7e.patch"; + sha256 = "0j8y3gns4lm0qxqxzmdn2ll0kq34mmfhf83lvsq13iqhp5bx3y31"; + }) + ]; + meta = with stdenv.lib; { homepage = "https://github.com/fd0/grobi"; description = "Automatically configure monitors/outputs for Xorg via RANDR"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/hsetroot/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/hsetroot/default.nix index 3bfe98a7a211..0d42687bf0b0 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/X11/hsetroot/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/hsetroot/default.nix @@ -1,36 +1,40 @@ -{ stdenv, fetchurl, autoconf, automake, imlib2, libtool, libX11, pkgconfig, xorgproto }: +{ stdenv +, fetchFromGitHub +, pkg-config +, imlib2 +, libX11 +, libXinerama +}: stdenv.mkDerivation rec { pname = "hsetroot"; - version = "1.0.2"; + version = "1.0.5"; - # The primary download site seems to no longer exist; use Gentoo's mirror for now. - src = fetchurl { - url = "http://mirror.datapipe.net/gentoo/distfiles/hsetroot-${version}.tar.gz"; - sha256 = "d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7"; + src = fetchFromGitHub { + owner = "himdel"; + repo = "hsetroot"; + rev = version; + sha256 = "1jbk5hlxm48zmjzkaq5946s58rqwg1v1ds2sdyd2ba029hmvr722"; }; - # See https://bugs.gentoo.org/show_bug.cgi?id=504056 - underlinkingPatch = fetchurl { - url = "http://www.gtlib.gatech.edu/pub/gentoo/gentoo-x86-portage/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch"; - name = "hsetroot-1.0.2-underlinking.patch"; - sha256 = "1px1p3wz7ji725z9nlwb0x0h6lnnvnpz15sblzzq7zrijl3wz65x"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake imlib2 libtool libX11 xorgproto ]; - - patches = [ underlinkingPatch ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + imlib2 + libX11 + libXinerama + ]; - patchFlags = [ "-p0" ]; + makeFlags = [ "PREFIX=$(out)" ]; - preConfigure = "./autogen.sh"; + preInstall = '' + mkdir -p "$out/bin" + ''; meta = with stdenv.lib; { description = "Allows you to compose wallpapers ('root pixmaps') for X"; - homepage = "https://thegraveyard.org/hsetroot.html"; + homepage = "https://github.com/himdel/hsetroot"; license = licenses.gpl2Plus; - maintainers = [ maintainers.henrytill ]; + maintainers = with maintainers; [ henrytill shamilton ]; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/nx-libs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/nx-libs/default.nix index c08a2fd21855..807282fae598 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/X11/nx-libs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/nx-libs/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { pname = "nx-libs"; - version = "3.5.99.24"; + version = "3.5.99.25"; src = fetchFromGitHub { owner = "ArcticaProject"; repo = "nx-libs"; rev = version; - sha256 = "0knx4phya90ahjxaflkvnnb7w22vdwjf7r78dhzmbmlccnlvwi7q"; + sha256 = "01aqdwy0i4nxdyfa24bwnrqjz93q0idihdaqals2yjqpg160nwfc"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig which diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix index a2a7e5e6922b..054e061c4ac8 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix @@ -1,12 +1,16 @@ -{ stdenv, fetchurl, cmake, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk }: +{ stdenv, fetchurl, cmake +, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk +, xorg +, opencl-headers, opencl-clhpp, ocl-icd +}: stdenv.mkDerivation rec { pname = "virtualgl-lib"; - version = "2.6.2"; + version = "2.6.5"; src = fetchurl { url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz"; - sha256 = "0ngqwsm9bml6lis0igq3bn92amh04rccd6jhjibj3418hrbzipvr"; + sha256 = "1giin3jmcs6y616bb44bpz30frsmj9f8pz2vg7jvb9vcfc9456rr"; }; cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" ]; @@ -15,7 +19,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ libjpeg_turbo libGL libGLU fltk libX11 libXv libXtst ]; + buildInputs = [ libjpeg_turbo libGL libGLU fltk + libX11 libXv libXtst xorg.xcbutilkeysyms + opencl-headers opencl-clhpp ocl-icd + ]; + + fixupPhase = '' + substituteInPlace $out/bin/vglrun \ + --replace "LD_PRELOAD=libvglfaker" "LD_PRELOAD=$out/lib/libvglfaker" \ + --replace "LD_PRELOAD=libdlfaker" "LD_PRELOAD=$out/lib/libdlfaker" \ + --replace "LD_PRELOAD=libgefaker" "LD_PRELOAD=$out/lib/libgefaker" + ''; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/wpgtk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/wpgtk/default.nix index 2aa05935991e..84d1f379e8aa 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/X11/wpgtk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/wpgtk/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "6.1.0"; + version = "6.1.3"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = version; - sha256 = "06z6qbfd9l3acp3wm28rq4vx3m5cxi4lpxgzc2nxvxmiz8rnnmh1"; + sha256 = "1jv28ygsd6ifjb096w3pm50za6wi62y45ycbizwhv7x56lr6zx1v"; }; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/x11spice/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/x11spice/default.nix index 23af2ac44ca6..33bc9110848e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/X11/x11spice/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/x11spice/default.nix @@ -24,10 +24,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lpthread"; meta = with stdenv.lib; { - description = '' - x11spice will enable a running X11 desktop to be available - via a Spice server - ''; + description = "Enable a running X11 desktop to be available via a Spice server"; homepage = "https://gitlab.freedesktop.org/spice/x11spice"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/x11vnc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/x11vnc/default.nix index 2f7b0d7697e5..5ed827b5a546 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/X11/x11vnc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/x11vnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, +{ stdenv, fetchFromGitHub, fetchpatch, openssl, zlib, libjpeg, xorg, coreutils, libvncserver, autoreconfHook, pkgconfig }: @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "1g652mmi79pfq4p5p7spaswa164rpzjhc5rn2phy5pm71lm0vib1"; }; + patches = [ + (fetchpatch { + name = "CVE-2020-29074.patch"; + url = "https://github.com/LibVNC/x11vnc/commit/69eeb9f7baa14ca03b16c9de821f9876def7a36a.patch"; + sha256 = "0hdhp32g2i5m0ihmaxkxhsn3d5f2qasadvwpgxify4xnzabmyb2d"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix index ccea6a2233cc..85d87d9e36d6 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix @@ -36,17 +36,15 @@ stdenv.mkDerivation rec { cp ${mimisrc}/xdg-open $out/bin/xdg-open '' + '' sed '2s#.#\ - cut() { ${coreutils}/bin/cut "$@"; }\ sed() { ${gnused}/bin/sed "$@"; }\ grep() { ${gnugrep}/bin/grep "$@"; }\ egrep() { ${gnugrep}/bin/egrep "$@"; }\ file() { ${file}/bin/file "$@"; }\ awk() { ${gawk}/bin/awk "$@"; }\ - sort() { ${coreutils}/bin/sort "$@"; }\ xset() { ${xset}/bin/xset "$@"; }\ perl() { PERL5LIB=${perlPath} ${perlPackages.perl}/bin/perl "$@"; }\ mimetype() { ${perlPackages.FileMimeInfo}/bin/mimetype "$@"; }\ - PATH=$PATH:'"$out"'/bin\ + PATH=$PATH:'$out'/bin:${coreutils}/bin\ &#' -i "$out"/bin/* substituteInPlace $out/bin/xdg-open \ @@ -58,7 +56,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/xdg-email \ --replace "/bin/echo" "${coreutils}/bin/echo" - sed 's# which # type -P #g' -i "$out"/bin/* + sed 's|\bwhich\b|type -P|g' -i "$out"/bin/* ''; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/xpra/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/xpra/default.nix index 7f46e017c367..3f1bf557ae8e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/X11/xpra/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/xpra/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk -, wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which +, wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which , ffmpeg, x264, libvpx, libwebp, x265 , libfakeXinerama , gst_all_1, pulseaudio, gobject-introspection @@ -97,7 +97,7 @@ in buildPythonApplication rec { --set XPRA_INSTALL_PREFIX "$out" --set XPRA_COMMAND "$out/bin/xpra" --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib - --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudio ]} + --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which util-linux pulseaudio ]} ) ''; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix index 7b30e5c58155..7bd0c3e6dcd4 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, gtk2, cmake, pkgconfig, libXdamage }: +{ stdenv, fetchFromGitHub, gtk2, cmake, pkgconfig, libXdamage }: stdenv.mkDerivation rec { version = "0.4.2"; pname = "xwinmosaic"; - src = fetchgit { - url = "https://github.com/soulthreads/xwinmosaic/"; - rev = "refs/tags/v0.4.2"; + src = fetchFromGitHub { + owner = "soulthreads"; + repo = pname; + rev = "refs/tags/v${version}"; sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr"; }; |