diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-03-08 23:07:15 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-03-08 23:10:43 +0300 |
| commit | f36b72107c57f5a5c7cbd3a8f9cb63f5f0231e76 (patch) | |
| tree | de6420da98acded99bc8555c3b90329af7bdd51f /pkgs/tools/X11 | |
| parent | 116953ffc90ff09b00b0130defb52949e8d53392 (diff) | |
| download | nixlib-f36b72107c57f5a5c7cbd3a8f9cb63f5f0231e76.tar nixlib-f36b72107c57f5a5c7cbd3a8f9cb63f5f0231e76.tar.gz nixlib-f36b72107c57f5a5c7cbd3a8f9cb63f5f0231e76.tar.bz2 nixlib-f36b72107c57f5a5c7cbd3a8f9cb63f5f0231e76.tar.lz nixlib-f36b72107c57f5a5c7cbd3a8f9cb63f5f0231e76.tar.xz nixlib-f36b72107c57f5a5c7cbd3a8f9cb63f5f0231e76.tar.zst nixlib-f36b72107c57f5a5c7cbd3a8f9cb63f5f0231e76.zip | |
primus: fix if nvidia is not used
Fixes #23628
Diffstat (limited to 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/primus/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
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} |