rust-overlay: Fix missing libz.so.1

mozilla · Jul 2, 2020 · ab9b53e · ab9b53e
1 parent e424ea2
commit ab9b53e
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/rust-overlay.nix b/rust-overlay.nix
@@ -175,9 +175,19 @@ let
                 if [[ "$i" =~ .build-id ]]; then continue; fi
                 if ! isELF "$i"; then continue; fi
                 echo "setting interpreter of $i"
-                patchelf \
-                  --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-                  "$i" || true
+                
+                if [[ -x "$i" ]]; then
+                  # Handle executables
+                  patchelf \
+                    --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+                    --set-rpath "${super.lib.makeLibraryPath [ self.zlib ]}:$out/lib" \
+                    "$i" || true
+                else
+                  # Handle libraries
+                  patchelf \
+                    --set-rpath "${super.lib.makeLibraryPath [ self.zlib ]}:$out/lib" \
+                    "$i" || true
+                fi
               done < <(find "$dir" -type f -print0)
             }