From f36b72107c57f5a5c7cbd3a8f9cb63f5f0231e76 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 8 Mar 2017 23:07:15 +0300 Subject: [PATCH] primus: fix if nvidia is not used Fixes #23628 --- pkgs/tools/X11/primus/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index 229e228e405c..d130c9bac7cc 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -20,7 +20,10 @@ 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; }; - 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" '' #!${stdenv.shell}