movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-11 20:25:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

primus: move to by-name

Browse source
This commit is contained in:
awwpotato 2025-04-18 20:24:04 -07:00
parent 971c590ecd
commit 7e6f24fe28
No known key found for this signature in database
2 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pkgs/tools/X11/primus/default.nix → pkgs/by-name/pr/primus/package.nix
View file

@ -5,19 +5,20 @@
# Other distributions do the same. # Other distributions do the same.
{ {
stdenv, stdenv,
stdenv_i686, pkgsi686Linux,
lib, lib,
primusLib, primusLib,
writeScriptBin, writeScriptBin,
runtimeShell, runtimeShell,
primusLib_i686 ? null, primusLib_i686 ?
if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.primusLib else null,
useNvidia ? true, useNvidia ? true,
}: }:
let let
# We override stdenv in case we need different ABI for libGL # We override stdenv in case we need different ABI for libGL
primusLib_ = primusLib.override { inherit stdenv; }; primusLib_ = primusLib.override { inherit stdenv; };
primusLib_i686_ = primusLib_i686.override { stdenv = stdenv_i686; }; primusLib_i686_ = primusLib_i686.override { stdenv = pkgsi686Linux.stdenv; };
primus = if useNvidia then primusLib_ else primusLib_.override { nvidia_x11 = null; }; primus = if useNvidia then primusLib_ else primusLib_.override { nvidia_x11 = null; };
primus_i686 = primus_i686 =

6
pkgs/top-level/all-packages.nix
View file

@ -16545,12 +16545,6 @@ with pkgs;
if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.virtualglLib else null; if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.virtualglLib else null;
}; };
primus = callPackage ../tools/X11/primus {
stdenv_i686 = pkgsi686Linux.stdenv;
primusLib_i686 =
if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.primusLib else null;
};
vlc-bin-universal = vlc-bin.override { variant = "universal"; }; vlc-bin-universal = vlc-bin.override { variant = "universal"; };
libvlc = vlc.override { libvlc = vlc.override {