diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-04 09:52:46 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-04 10:03:55 +0200 |
| commit | 7434b8c29f977f84ffbe3e2f6d12fd8346b95d18 (patch) | |
| tree | 3392d42839b35625ebd350e4f7a99770492c5a9e /pkgs/development | |
| parent | 2323d70d88aab404b9ce00af6c3ab4f5f6da2fa9 (diff) | |
| download | nixpkgs-7434b8c29f977f84ffbe3e2f6d12fd8346b95d18.tar nixpkgs-7434b8c29f977f84ffbe3e2f6d12fd8346b95d18.tar.gz nixpkgs-7434b8c29f977f84ffbe3e2f6d12fd8346b95d18.tar.bz2 nixpkgs-7434b8c29f977f84ffbe3e2f6d12fd8346b95d18.tar.lz nixpkgs-7434b8c29f977f84ffbe3e2f6d12fd8346b95d18.tar.xz nixpkgs-7434b8c29f977f84ffbe3e2f6d12fd8346b95d18.tar.zst nixpkgs-7434b8c29f977f84ffbe3e2f6d12fd8346b95d18.zip | |
mesa: fixup with multiple outputs
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 581368589b1..1d34b87ce64 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 ''; |