git.iko.soy/typeable/nixpkgs
on master help sign in
mesa: Don't fail to build when d3d isn't built
commite22d1d37cc4b3c72e22adb2d6488d2ce22648943 authorLas <las@protonmail.ch> dateWed 28 Apr 2021, 20:29 (6 years ago) parent1e4cba2
1 file changed+2−2
pkgs/development/libraries/mesa/default.nix+2−2
pkgs/development/libraries/mesa/default.nix+2−2
@@ -185,14 +185,14 @@ self = stdenv.mkDerivation {
185185 postFixup = optionalString stdenv.isLinux ''
186186 # set the default search path for DRI drivers; used e.g. by X server
187187 substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace "$drivers" "${libglvnd.driverLink}"
188− substituteInPlace "$dev/lib/pkgconfig/d3d.pc" --replace "$drivers" "${libglvnd.driverLink}"
188+ [ -f "$dev/lib/pkgconfig/d3d.pc" ] && substituteInPlace "$dev/lib/pkgconfig/d3d.pc" --replace "$drivers" "${libglvnd.driverLink}"
189189
190190 # remove pkgconfig files for GL/EGL; they are provided by libGL.
191191 rm -f $dev/lib/pkgconfig/{gl,egl}.pc
192192
193193 # Move development files for libraries in $drivers to $driversdev
194194 mkdir -p $driversdev/include
195− mv $dev/include/xa_* $dev/include/d3d* $driversdev/include
195+ mv $dev/include/xa_* $dev/include/d3d* -t $driversdev/include || true
196196 mkdir -p $driversdev/lib/pkgconfig
197197 for pc in lib/pkgconfig/{xatracker,d3d}.pc; do
198198 if [ -f "$dev/$pc" ]; then