Merge #166494: mesa: Fix cross-compilation

...into staging-next
2022-04-10 11:12:28 +02:00
parent 2459b6628f 3ddd9479c9
commit 5e71a3f0be
1 changed files with 2 additions and 1 deletions
@@ -154,6 +154,7 @@ self = stdenv.mkDerivation {
    meson pkg-config ninja
    intltool bison flex file
    python3Packages.python python3Packages.Mako
+    jdupes
  ] ++ lib.optionals (elem "wayland" eglPlatforms) [
    wayland-scanner
  ];
@@ -230,7 +231,7 @@ self = stdenv.mkDerivation {
    done

    # NAR doesn't support hard links, so convert them to symlinks to save space.
-    ${jdupes}/bin/jdupes --hard-links --link-soft --recurse "$drivers"
+    jdupes --hard-links --link-soft --recurse "$drivers"

    # add RPATH so the drivers can find the moved libgallium and libdricore9
    # moved here to avoid problems with stripping patchelfed files