From 1fc19adf2c9d360aac3af63f901c3315ddf20dfd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 13 May 2015 18:14:27 +0200 Subject: [PATCH] mesa: Remove gallium references These files no longer exist. The resulting failures were hidden by @vcunat --- pkgs/development/libraries/mesa/default.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2e94626411e..d5838308b39 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -132,9 +132,6 @@ stdenv.mkDerivation { `#$out/lib/libXvMC*` \ $out/lib/gbm $out/lib/libgbm* \ '' + '' - $out/lib/gallium-pipe \ - $out/lib/libdricore* \ - $out/lib/libgallium* \ $out/lib/vdpau \ $out/lib/libxatracker* @@ -149,18 +146,6 @@ stdenv.mkDerivation { $out/lib/pkgconfig/osmesa.pc '' + /* now fix references in .la files */ '' - sed "/^libdir=/s,$out,$drivers," -i \ - '' + optionalString enableExtraFeatures '' - `#$drivers/lib/libXvMC*.la` \ - '' + '' - $drivers/lib/gallium-pipe/*.la \ - $drivers/lib/libgallium.la \ - $drivers/lib/vdpau/*.la \ - $drivers/lib/libdricore*.la - - sed "s,$out\(/lib/\(libdricore[0-9\.]*\|libgallium\).la\),$drivers\1,g" \ - -i $drivers/lib/*.la $drivers/lib/*/*.la - sed "/^libdir=/s,$out,$osmesa," -i \ $osmesa/lib/libOSMesa*.la