alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

bumblebee: remove X libraries from LD_LIBRARY_PATH

Browse source 
They seem to no longer be needed.
This commit is contained in:
Nikolay Amiantov 2018-03-19 12:43:36 +03:00
parent 9cdaddf3a0
commit 7fe170baff
1 changed files with 2 additions and 4 deletions

6
pkgs/tools/X11/bumblebee/default.nix
View file

@ -39,7 +39,7 @@ let
primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; }; primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; };
primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; }; primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; };
primusLibs = lib.makeLibraryPath ([primus] ++ lib.optional (primusLib_i686 != null) primus_i686); primusLibs = lib.makeLibraryPath ([ primus ] ++ lib.optional (primusLib_i686 != null) primus_i686);
nvidia_x11s = [ nvidia_x11 ] nvidia_x11s = [ nvidia_x11 ]
++ lib.optional nvidia_x11.useGLVND libglvnd ++ lib.optional nvidia_x11.useGLVND libglvnd
@ -49,7 +49,6 @@ let
nvidiaLibs = lib.makeLibraryPath nvidia_x11s; nvidiaLibs = lib.makeLibraryPath nvidia_x11s;
bbdPath = lib.makeBinPath [ kmod xorgserver ]; bbdPath = lib.makeBinPath [ kmod xorgserver ];
bbdLibs = lib.makeLibraryPath [ libX11 libXext ];
xmodules = lib.concatStringsSep "," (map (x: "${x.out or x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau)); xmodules = lib.concatStringsSep "," (map (x: "${x.out or x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau));
@ -133,8 +132,7 @@ in stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram "$out/sbin/bumblebeed" \ wrapProgram "$out/sbin/bumblebeed" \
--prefix PATH : "${bbdPath}" \ --prefix PATH : "${bbdPath}"
--prefix LD_LIBRARY_PATH : "${bbdLibs}"
wrapProgram "$out/bin/optirun" \ wrapProgram "$out/bin/optirun" \
--prefix PATH : "${virtualgl}/bin" --prefix PATH : "${virtualgl}/bin"