From 7434b8c29f977f84ffbe3e2f6d12fd8346b95d18 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 4 Oct 2015 09:52:46 +0200
Subject: mesa: fixup with multiple outputs

---
 pkgs/development/libraries/mesa/default.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 581368589b14..1d34b87ce641 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -125,29 +125,18 @@ stdenv.mkDerivation {
       $out/lib/libXvMC* \
       $out/lib/d3d \
       $out/lib/vdpau \
-      $out/lib/{bellagio,d3d} \
       $out/lib/libxatracker*
 
-    mv -t "$drivers/lib/dri/" \
-      "$out"/lib/dri/*
-    rmdir "$out/lib/dri"
-
-    mkdir -p {$osmesa,$drivers}/lib/pkgconfig
+    mkdir -p {$osmesa,$drivers}/lib/
     mv -t $osmesa/lib/ \
       $out/lib/libOSMesa*
 
-    mv -t $drivers/lib/pkgconfig/ \
-      $out/lib/pkgconfig/xatracker.pc
-
-    mv -t $osmesa/lib/pkgconfig/ \
-      $out/lib/pkgconfig/osmesa.pc
-
   '' + /* now fix references in .la files */ ''
     sed "/^libdir=/s,$out,$osmesa," -i \
       $osmesa/lib/libOSMesa*.la
 
   '' + /* set the default search path for DRI drivers; used e.g. by X server */ ''
-    substituteInPlace "$out/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}"
+    substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}"
   '' + /* move vdpau drivers to $drivers/lib, so they are found */ ''
     mv "$drivers"/lib/vdpau/* "$drivers"/lib/ && rmdir "$drivers"/lib/vdpau
   '';
-- 
cgit 1.4.1