diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2018-03-19 12:43:36 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2018-03-26 14:02:06 +0300 |
| commit | 7fe170baff7090a3f281d7ac724830bbe191959d (patch) | |
| tree | d5eb570726f359e6da501269fdb596f7241250e5 /pkgs/tools/X11/bumblebee/default.nix | |
| parent | 9cdaddf3a001ef7fadfc1a86f094ba45d6ffc7a6 (diff) | |
| download | nixpkgs-7fe170baff7090a3f281d7ac724830bbe191959d.tar nixpkgs-7fe170baff7090a3f281d7ac724830bbe191959d.tar.gz nixpkgs-7fe170baff7090a3f281d7ac724830bbe191959d.tar.bz2 nixpkgs-7fe170baff7090a3f281d7ac724830bbe191959d.tar.lz nixpkgs-7fe170baff7090a3f281d7ac724830bbe191959d.tar.xz nixpkgs-7fe170baff7090a3f281d7ac724830bbe191959d.tar.zst nixpkgs-7fe170baff7090a3f281d7ac724830bbe191959d.zip | |
bumblebee: remove X libraries from LD_LIBRARY_PATH
They seem to no longer be needed.
Diffstat (limited to 'pkgs/tools/X11/bumblebee/default.nix')
| -rw-r--r-- | pkgs/tools/X11/bumblebee/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 7868c2726ec..8ad1b6f6455 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -39,7 +39,7 @@ let 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; }; - 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 ] ++ lib.optional nvidia_x11.useGLVND libglvnd @@ -49,7 +49,6 @@ let nvidiaLibs = lib.makeLibraryPath nvidia_x11s; 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)); @@ -133,8 +132,7 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/sbin/bumblebeed" \ - --prefix PATH : "${bbdPath}" \ - --prefix LD_LIBRARY_PATH : "${bbdLibs}" + --prefix PATH : "${bbdPath}" wrapProgram "$out/bin/optirun" \ --prefix PATH : "${virtualgl}/bin" |