Syzygial/ccpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now Passing

Browse Source
This commit is contained in:
David Crompton
2023-05-23 13:15:36 -04:00
parent dcea1444c3
commit 175d46bdd9
14 changed files with 132 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/opengl/default.nix
View File

@@ -3,8 +3,8 @@
# Add a setup hook to the mesa package that automatically adds a
# libvglfaker.so dependency to executables that depend on libGL.so.
{ super, stdenv, buildEnv, substituteAll, bash
, autoreconfHook, pkgconfig, python2
{ prev, stdenv, buildEnv, substituteAll, bash
, autoreconfHook, pkg-config, python2
, xorg, llvmPackages, expat, mesa_glxgallium, mesa, libglvnd }:
let
@@ -13,23 +13,23 @@ let
# Ugliness required to break the loop created by the fact that
# the libGL hook requires VirtualGL which requires libGL.
#
# This would be clean if super was closed on itself (nixpkgs #15280)
# This would be clean if prev was closed on itself (nixpkgs #15280)
libGL = super.libGL;
libGLU = super.libGLU.override { inherit libGL; };
libGL = prev.libGL;
libGLU = prev.libGLU.override { inherit libGL; };
libGLU_combined = buildEnv {
name = "libGLU-combined";
paths = [ libGL libGLU ];
extraOutputsToInstall = [ "dev" ];
};
virtualglLib = (super.virtualglLib.override { inherit libGL libGLU fltk; }).overrideAttrs (attrs: {
virtualglLib = (prev.virtualglLib.override { inherit libGL libGLU fltk; }).overrideAttrs (attrs: {
postFixup = attrs.postFixup or "" + ''
patchelf --set-rpath /usr/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/nvidia:"$(patchelf --print-rpath $out/lib/libvglfaker.so)" $out/lib/libvglfaker.so
'';
} );
fltk = super.fltk.override { inherit libGL libGLU freeglut; };
freeglut = super.freeglut.override { inherit libGL libGLU; };
fltk = prev.fltk.override { inherit libGL libGLU freeglut; };
freeglut = prev.freeglut.override { inherit libGL libGLU; };
in
substituteAll {
src = ./insert-virtualgl.sh;