alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

libGL rename: fallout after a week on master

Browse source 
and a few nitpicks.
This commit is contained in:
Vladimír Čunát 2018-03-05 14:53:38 +01:00
parent 565bd805e6
commit 04c31a5de1
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/video/avidemux/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, cmake, pkgconfig, lndir { stdenv, lib, fetchurl, cmake, pkgconfig, lndir
, zlib, gettext, libvdpau, libva, libXv, sqlite , zlib, gettext, libvdpau, libva, libXv, sqlite
, yasm, freetype, fontconfig, fribidi , yasm, freetype, fontconfig, fribidi
, makeWrapper, libXext, mesa_glu, qttools, qtbase , makeWrapper, libXext, libGLU, qttools, qtbase
, alsaLib , alsaLib
, withX265 ? true, x265 , withX265 ? true, x265
, withX264 ? true, x264 , withX264 ? true, x264
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ yasm cmake pkgconfig ]; nativeBuildInputs = [ yasm cmake pkgconfig ];
buildInputs = [ buildInputs = [
zlib gettext libvdpau libva libXv sqlite fribidi fontconfig zlib gettext libvdpau libva libXv sqlite fribidi fontconfig
freetype alsaLib libXext mesa_glu makeWrapper freetype alsaLib libXext libGLU makeWrapper
] ++ lib.optional withX264 x264 ] ++ lib.optional withX264 x264
++ lib.optional withX265 x265 ++ lib.optional withX265 x265
++ lib.optional withXvid xvidcore ++ lib.optional withXvid xvidcore

2
pkgs/development/libraries/mesa/default.nix
View file

@ -14,7 +14,7 @@
}: }:
/** Packaging design: /** Packaging design:
- The basic mesa ($out) contains headers and libraries (GLU is in mesa_glu now). - The basic mesa ($out) contains headers and libraries (GLU is in libGLU now).
This or the mesa attribute (which also contains GLU) are small (~ 2 MB, mostly headers) This or the mesa attribute (which also contains GLU) are small (~ 2 MB, mostly headers)
and are designed to be the buildInput of other packages. and are designed to be the buildInput of other packages.
- DRI drivers are compiled into $drivers output, which is much bigger and - DRI drivers are compiled into $drivers output, which is much bigger and

4
pkgs/development/libraries/virglrenderer/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, mesa_noglu, epoxy, libX11 }: { stdenv, fetchurl, pkgconfig, libGLU, epoxy, libX11 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "a549e351e0eb2ad1df471386ddcf85f522e7202808d1616ee9ff894209066e1a"; sha256 = "a549e351e0eb2ad1df471386ddcf85f522e7202808d1616ee9ff894209066e1a";
}; };
buildInputs = [ mesa_noglu epoxy libX11 ]; buildInputs = [ libGLU epoxy libX11 ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

10
pkgs/tools/X11/primus/lib.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, fetchpatch { stdenv, fetchFromGitHub, fetchpatch
, libX11, mesa_noglu , libX11, libGL
, nvidia_x11 ? null , nvidia_x11 ? null
, libglvnd , libglvnd
}: }:
let let
aPackage = aPackage =
if nvidia_x11 == null then mesa_noglu if nvidia_x11 == null then libGL
else if nvidia_x11.useGLVND then libglvnd else if nvidia_x11.useGLVND then libglvnd
else nvidia_x11; else nvidia_x11;
@ -28,12 +28,12 @@ in stdenv.mkDerivation {
}) })
]; ];
buildInputs = [ libX11 mesa_noglu ]; buildInputs = [ libX11 libGL ];
makeFlags = [ "LIBDIR=$(out)/lib" makeFlags = [ "LIBDIR=$(out)/lib"
"PRIMUS_libGLa=${aPackage}/lib/libGL.so" "PRIMUS_libGLa=${aPackage}/lib/libGL.so"
"PRIMUS_libGLd=${mesa_noglu}/lib/libGL.so" "PRIMUS_libGLd=${libGL}/lib/libGL.so"
"PRIMUS_LOAD_GLOBAL=${mesa_noglu}/lib/libglapi.so" "PRIMUS_LOAD_GLOBAL=${libGL}/lib/libglapi.so"
]; ];
installPhase = '' installPhase = ''

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

@ -8599,7 +8599,7 @@ with pkgs;
# Multi-arch "drivers" which we want to build for i686. # Multi-arch "drivers" which we want to build for i686.
driversi686Linux = recurseIntoAttrs { driversi686Linux = recurseIntoAttrs {
inherit (pkgsi686Linux) inherit (pkgsi686Linux)
mesa_noglu mesa_drivers
vaapiIntel vaapiIntel
libvdpau-va-gl libvdpau-va-gl
vaapiVdpau vaapiVdpau
@ -12775,7 +12775,7 @@ with pkgs;
inherit (buildPackages) pkgconfig xmlto asciidoc flex bison; inherit (buildPackages) pkgconfig xmlto asciidoc flex bison;
inherit (darwin) apple_sdk cf-private libobjc; inherit (darwin) apple_sdk cf-private libobjc;
bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
mesa = mesa_noglu; mesa = libGL;
python = python2; # Incompatible with Python 3x python = python2; # Incompatible with Python 3x
udev = if stdenv.isLinux then udev else null; udev = if stdenv.isLinux then udev else null;
libdrm = if stdenv.isLinux then libdrm else null; libdrm = if stdenv.isLinux then libdrm else null;