From 9b7edbeb2f4e3494b3c466b5ed97652348b22b2f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 31 Mar 2016 19:51:15 +0300 Subject: [PATCH] primus: propagate stdenv to primusLibs --- pkgs/tools/X11/primus/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index f0a971dde18..88589a05878 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -4,6 +4,7 @@ # same LD_LIBRARY_PATH. # Other distributions do the same. { stdenv +, stdenv_i686 , primusLib , writeScriptBin , primusLib_i686 ? null @@ -11,8 +12,12 @@ }: 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; }; + # We override stdenv in case we need different ABI for libGL + primusLib_ = primusLib.override { inherit stdenv; }; + primusLib_i686_ = primusLib_i686.override { stdenv = stdenv_i686; }; + + 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 = stdenv.lib.makeLibraryPath ([primus] ++ stdenv.lib.optional (primusLib_i686 != null) primus_i686); in writeScriptBin "primusrun" '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc8896d4c45..b85650072b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14082,6 +14082,7 @@ in }; primus = callPackage ../tools/X11/primus { + stdenv_i686 = pkgsi686Linux.stdenv; primusLib_i686 = if system == "x86_64-linux" then pkgsi686Linux.primusLib else null;