push sheeet

pkgs/tools/X11/libstrangle/default.nix

@@ -0,0 +1,61 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  fetchpatch,
+  libGL,
+  libX11,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libstrangle";
+  version = "unstable-202202022";
+
+  buildInputs = [
+    libGL
+    libX11
+  ];
+
+  src = fetchFromGitLab {
+    owner = "torkel104";
+    repo = pname;
+    rev = "0273e318e3b0cc759155db8729ad74266b74cb9b";
+    hash = "sha256-h10QA7m7hIQHq1g/vCYuZsFR2NVbtWBB46V6OWP5wgM=";
+  };
+
+  makeFlags = [
+    "prefix="
+    "DESTDIR=$(out)"
+  ];
+
+  patches = [
+    ./nixos.patch
+    # Pull the fix pending upstream inclusion for gcc-13:
+    #   https://gitlab.com/torkel104/libstrangle/-/merge_requests/29
+    (fetchpatch {
+      name = "gcc-13.patch";
+      url = "https://gitlab.com/torkel104/libstrangle/-/commit/4e17025071de1d99630febe7270b4f63056d0dfa.patch";
+      hash = "sha256-AKMHAZhCPcn62pi4fBGhw2r8SNSkCDMUCpR3IlmJ7wQ=";
+    })
+  ];
+
+  postPatch = ''
+    substituteAllInPlace src/strangle.sh
+    substituteAllInPlace src/stranglevk.sh
+  '';
+  postInstall = ''
+    substitute $out/share/vulkan/implicit_layer.d/libstrangle_vk.json $out/share/vulkan/implicit_layer.d/libstrangle_vk.x86.json \
+      --replace "libstrangle_vk.so" "$out/lib/libstrangle/lib32/libstrangle_vk.so"
+    substituteInPlace $out/share/vulkan/implicit_layer.d/libstrangle_vk.json \
+      --replace "libstrangle_vk.so" "$out/lib/libstrangle/lib64/libstrangle_vk.so"
+  '';
+
+  meta = with lib; {
+    homepage = "https://gitlab.com/torkel104/libstrangle";
+    description = "Frame rate limiter for Linux/OpenGL";
+    license = licenses.gpl3;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ aske ];
+    mainProgram = "strangle";
+  };
+}

pkgs/tools/X11/libstrangle/nixos.patch

@@ -0,0 +1,43 @@
+diff --git a/makefile b/makefile
+--- a/makefile
++++ b/makefile
+@@ -86,10 +86,6 @@ install-common:
+ 	install -m 0755 -D -T $(SOURCEDIR)/stranglevk.sh $(DESTDIR)$(bindir)/stranglevk
+ 	install -m 0644 -D -T $(SOURCEDIR)/vulkan/libstrangle_vk.json $(DESTDIR)$(datarootdir)/vulkan/implicit_layer.d/libstrangle_vk.json
+ 
+-install-ld: ld
+-	install -m 0644 -D -T $(BUILDDIR)/libstrangle.conf $(DESTDIR)/etc/ld.so.conf.d/libstrangle.conf
+-	if [ -z "$(DESTDIR)" ]; then ldconfig; fi
+-
+ install-32: 32-bit
+ 	install -m 0755 -D -T $(BUILDDIR)/libstrangle32.so $(DESTDIR)$(LIB32_PATH)/libstrangle.so
+ 	install -m 0755 -D -T $(BUILDDIR)/libstrangle32_nodlsym.so $(DESTDIR)$(LIB32_PATH)/libstrangle_nodlsym.so
+@@ -109,8 +105,7 @@ install: \
+ 	all \
+ 	install-common \
+ 	install-32 \
+-	install-64 \
+-	install-ld
++	install-64
+ 
+ clean:
+ 	rm -f $(BUILDDIR)/libstrangle64.so
+diff --git a/src/strangle.sh b/src/strangle.sh
+--- a/src/strangle.sh
++++ b/src/strangle.sh
+@@ -130,6 +130,5 @@ if [ "$STRANGLE_VKONLY" != "1" ]; then
+ 	fi
+ fi
+ 
+-# Execute the strangled program under a clean environment
+ # pass through the FPS and overriden LD_PRELOAD environment variables
+-exec env ENABLE_VK_LAYER_TORKEL104_libstrangle=1 LD_PRELOAD="${LD_PRELOAD}" "$@"
++ENABLE_VK_LAYER_TORKEL104_libstrangle=1 XDG_DATA_DIRS="${XDG_DATA_DIRS}${XDG_DATA_DIRS:+:}@out@/share" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@out@/lib/libstrangle/lib64:@out@/lib/libstrangle/lib32" LD_PRELOAD="${LD_PRELOAD}" exec "$@"
+diff --git a/src/stranglevk.sh b/src/stranglevk.sh
+--- a/src/stranglevk.sh
++++ b/src/stranglevk.sh
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-ENABLE_VK_LAYER_TORKEL104_libstrangle=1 STRANGLE_VKONLY=1 strangle "$@"
++ENABLE_VK_LAYER_TORKEL104_libstrangle=1 STRANGLE_VKONLY=1 @out@/bin/strangle "$@"

pkgs/tools/X11/virtualgl/default.nix

@@ -0,0 +1,45 @@
+{
+  stdenv,
+  lib,
+  virtualglLib,
+  virtualglLib_i686 ? null,
+  makeWrapper,
+  vulkan-loader,
+  addDriverRunpath,
+}:
+
+stdenv.mkDerivation {
+  pname = "virtualgl";
+  version = lib.getVersion virtualglLib;
+
+  paths = [ virtualglLib ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildCommand = ''
+    mkdir -p $out/bin
+    for i in ${virtualglLib}/bin/* ${virtualglLib}/bin/.vglrun*; do
+      ln -s "$i" $out/bin
+    done
+
+    wrapProgram $out/bin/vglrun \
+      --prefix LD_LIBRARY_PATH : "${
+        lib.makeLibraryPath [
+          virtualglLib
+          virtualglLib_i686
+
+          addDriverRunpath.driverLink
+
+          # Needed for vulkaninfo to work
+          vulkan-loader
+        ]
+      }"
+  ''
+  + lib.optionalString (virtualglLib_i686 != null) ''
+    ln -sf ${virtualglLib_i686}/bin/.vglrun.vars32 $out/bin
+  '';
+
+  meta = {
+    platforms = lib.platforms.linux;
+    inherit (virtualglLib.meta) license;
+  };
+}

pkgs/tools/X11/virtualgl/lib.nix

@@ -0,0 +1,76 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  cmake,
+  libGL,
+  libGLU,
+  libXv,
+  libXtst,
+  libXi,
+  libjpeg_turbo,
+  fltk,
+  xorg,
+  opencl-headers,
+  opencl-clhpp,
+  ocl-icd,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "virtualgl-lib";
+  version = "3.0.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz";
+    sha256 = "sha256-OIEbwAQ71yOuHIzM+iaK7QkUJrKg6sXpGuFQOUPjM2w=";
+  };
+
+  postPatch = ''
+    # the unit tests take significant hacks to build and can't run anyway due to the lack
+    # of a 3D X server in the build sandbox. so we just chop out their build instructions.
+    head -n $(grep -n 'UNIT TESTS' server/CMakeLists.txt | cut -d : -f 1) server/CMakeLists.txt > server/CMakeLists2.txt
+    mv server/CMakeLists2.txt server/CMakeLists.txt
+  '';
+
+  cmakeFlags = [
+    "-DVGL_SYSTEMFLTK=1"
+    "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so"
+    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "4.0")
+  ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    libjpeg_turbo
+    libGL
+    libGLU
+    fltk
+    libXv
+    libXtst
+    libXi
+    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"
+  '';
+
+  meta = with lib; {
+    homepage = "https://www.virtualgl.org/";
+    description = "X11 GL rendering in a remote computer with full 3D hw acceleration";
+    license = with licenses; [
+      lgpl2Plus
+      wxWindowsException31
+    ];
+    platforms = platforms.linux;
+    maintainers = [ ];
+  };
+}

pkgs/tools/X11/xbindkeys-config/.editorconfig

@@ -0,0 +1,2 @@
+[xbindkeys-config.1]
+trim_trailing_whitespace = unset

pkgs/tools/X11/xbindkeys-config/default.nix

@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  gtk2,
+  pkg-config,
+  procps,
+  makeWrapper,
+  ...
+}:
+
+stdenv.mkDerivation rec {
+  pname = "xbindkeys-config";
+  version = "0.1.3";
+
+  # Workaround build failure on -fno-common toolchains like upstream
+  # gcc-10.
+  env.NIX_CFLAGS_COMPILE = "-fcommon";
+
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+  ];
+  buildInputs = [ gtk2 ];
+
+  src = fetchurl {
+    url = "mirror://debian/pool/main/x/xbindkeys-config/xbindkeys-config_${version}.orig.tar.gz";
+    sha256 = "1rs3li2hyig6cdzvgqlbz0vw6x7rmgr59qd6m0cvrai8xhqqykda";
+  };
+
+  hardeningDisable = [ "format" ];
+
+  meta = {
+    homepage = "https://packages.debian.org/source/xbindkeys-config";
+    description = "Graphical interface for configuring xbindkeys";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ benley ];
+    platforms = with lib.platforms; linux;
+    mainProgram = "xbindkeys-config";
+  };
+
+  patches = [ ./xbindkeys-config-patch1.patch ];
+
+  # killall is dangerous on non-gnu platforms. Use pkill instead.
+  postPatch = ''
+    substituteInPlace middle.c --replace "killall" "pkill -x"
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man/man1
+    gzip -c ${./xbindkeys-config.1} > $out/share/man/man1/xbindkeys-config.1.gz
+    cp xbindkeys_config $out/bin/xbindkeys-config
+    wrapProgram $out/bin/xbindkeys-config --prefix PATH ":" "${procps}/bin"
+  '';
+}

pkgs/tools/X11/xbindkeys-config/xbindkeys-config-patch1.patch

@@ -0,0 +1,108 @@
+---
+ Makefile           |  6 +++---
+ menu.c             | 11 ++++++++---
+ middle.c           |  9 +++++++--
+ xbindkeys_config.c |  3 ++-
+ 4 files changed, 20 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 602875c..28e46cd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,9 @@
+ # makefile cr<63>e par Laurent VUIBERT
+ 
+-CC=	gcc -O3 -Wall
++CC=	gcc $(CFLAGS)
+ STD=	_GNU_SOURCE
+-GTK=	`gtk-config  --cflags --libs`
+-GTK2=	`gtk-config  --cflags`
++GTK=	`pkg-config  --cflags --libs gtk+-2.0`
++GTK2=	`pkg-config  --cflags gtk+-2.0`
+ OBJS=	xbindkeys_config.o menu.o middle.o speedc.o
+ NOM=    xbindkeys_config
+ 
+diff --git a/menu.c b/menu.c
+index ed3e7ec..f11526d 100644
+--- a/menu.c
++++ b/menu.c
+@@ -283,6 +283,8 @@ void menu_manual (GtkMenuItem *menuitem, gpointer user_data)
+   GtkWidget *window;
+   GtkWidget *text;
+   GtkWidget *vbox;
++  GtkTextBuffer *textbuffer;
++  GtkTextIter iter;
+   
+   window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+   gtk_window_set_title(GTK_WINDOW(window),
+@@ -293,10 +295,13 @@ void menu_manual (GtkMenuItem *menuitem, gpointer user_data)
+   text = gtk_label_new("\nManual\n");
+   gtk_box_pack_start(GTK_BOX(vbox), text, FALSE, FALSE, 0);
+   
+-  text = gtk_text_new(NULL,NULL);
++/* BDD - FIXME */
++/*  text = gtk_text_new(NULL,NULL); */
++  text = gtk_text_view_new();
++  textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text));
++  gtk_text_buffer_get_iter_at_offset (textbuffer, &iter, 0);
+   
+-  
+-  gtk_text_insert (GTK_TEXT(text), NULL, NULL, NULL,
++  gtk_text_buffer_insert (textbuffer, &iter, 
+ 		   MANUAL_TEXT, sizeof(MANUAL_TEXT)-1);
+   gtk_box_pack_start(GTK_BOX(vbox), text, TRUE, TRUE, 0);
+   gtk_widget_set_usize(text,300,250);
+diff --git a/middle.c b/middle.c
+index daa61aa..605ab10 100644
+--- a/middle.c
++++ b/middle.c
+@@ -551,6 +551,8 @@ void view_generated_file()
+   GtkWidget *window;
+   GtkWidget *text;
+   GtkWidget *src;
++  GtkTextBuffer *textbuffer;
++  GtkTextIter iter;
+   char line  [1024];
+ 
+   unlink(TEMP_FILE); 
+@@ -561,11 +563,13 @@ void view_generated_file()
+     gtk_window_set_title(GTK_WINDOW(window), "Generated File");
+     src = gtk_scrolled_window_new ( NULL, NULL );
+     gtk_widget_set_usize(src,500,400);
+-    text = gtk_text_new (NULL, NULL);
++    text = gtk_text_view_new ();
++    textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text));
++    gtk_text_buffer_get_iter_at_offset (textbuffer, &iter, 0);
+     gtk_container_add (GTK_CONTAINER(src),  text);
+ 
+     while (fgets (line, sizeof(line), f))
+-      gtk_text_insert (GTK_TEXT(text), NULL, NULL, NULL,
++      gtk_text_buffer_insert (textbuffer, &iter,
+ 		       line, strlen(line));
+ 
+     gtk_container_add(GTK_CONTAINER(window),src);
+@@ -610,6 +614,7 @@ void  save_file(char file_out[])
+   fprintf(f, "# m:xxx + c:xxx \n");
+   fprintf(f, "# Shift+... \n\n\n\n\n");
+ 
++
+   if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(Flag_NumLock)))
+     fprintf(f,"keystate_numlock = enable\n");
+   else 
+diff --git a/xbindkeys_config.c b/xbindkeys_config.c
+index 75bad30..3c02a2b 100644
+--- a/xbindkeys_config.c
++++ b/xbindkeys_config.c
+@@ -95,7 +95,8 @@ int main (int argc, char *argv[])
+      accel_group = gtk_accel_group_new();
+      menu=xbindkeys_config_menu(accel_group);
+      gtk_box_pack_start(GTK_BOX(vbox),menu,FALSE,FALSE,0);
+-     gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
++/* BDD - FIXME - Don't need this? */
++/*     gtk_accel_group_attach(accel_group, GTK_OBJECT(window)); */
+      
+      middle= xbindkeys_config_middle();
+      gtk_box_pack_start(GTK_BOX(vbox),middle,TRUE,TRUE,0);
+-- 
+2.1.3
+

pkgs/tools/X11/xbindkeys-config/xbindkeys-config.1

@@ -0,0 +1,21 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.27.
+.TH XBINDKEYS_CONFIG "1" "April 2002" "xbindkeys-config" "User Commands"
+.SH NAME
+xbindkeys-config \- GTK+ configuration tool for xbindkeys
+.SH "SYNOPSIS"
+xbindkeys-config 
+[\-\-file|\-f file]
+[\-\-help|\-h]
+[\-\-show|\-s]
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+This Help
+.TP
+\fB\-f\fR, \fB\-\-file\fR
+Use an alternative rc file
+.TP
+\fB\-s\fR, \fB\-\-show\fR
+show only the rc file
+.SH AUTHOR
+This manual page was written by Joerg Jaspert <joerg@debian.org>,
+for the Debian GNU/Linux system (but may be used by others).