public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

primus: fix if nvidia is not used

Browse Source 
Fixes #23628
This commit is contained in:
Nikolay Amiantov 2017-03-08 23:07:15 +03:00
parent 116953ffc9
commit f36b72107c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/X11/primus/default.nix
View File

@ -20,7 +20,10 @@ 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; };
ldPath = lib.makeLibraryPath ([ primus primus.glvnd ] ++ lib.optionals (primusLib_i686 != null) [ primus_i686 primus_i686.glvnd ]); ldPath = lib.makeLibraryPath (lib.filter (x: x != null) (
[ primus primus.glvnd ]
++ lib.optionals (primusLib_i686 != null) [ primus_i686 primus_i686.glvnd ]
));
in writeScriptBin "primusrun" '' in writeScriptBin "primusrun" ''
#!${stdenv.shell} #!${stdenv.shell}