Fix some edge cases

.gitignore

@@ -1,2 +1,2 @@
-examples/
+/examples/*/result*
 target/

examples/dependencyedgecasetests/default.nix

@@ -0,0 +1,69 @@
+let
+  pkgs = import <nixpkgs> { };
+in
+  pkgs.callPackage ({ callPackage, rustChannelOf }:
+    let
+      rustChannel = rustChannelOf {
+        date = "2020-03-31";
+        channel = "nightly";
+      };
+      mkRustCrate = callPackage ../../mkRustCrate/lib/mkRustCrate {
+        inherit (rustChannel) cargo rust;
+      };
+      fetchFromCratesIo = callPackage ../../mkRustCrate/lib/fetchFromCratesIo { };
+    in
+    rec {
+
+      serde_derive = mkRustCrate rec {
+        name = "serde_derive";
+        version = "1.0.106";
+        src = fetchFromCratesIo {
+          inherit name version;
+          sha256 = "03wq260g5prkgxgfq4yhbmznqm2rr3qmhqah6mh6ddvpmq6axz3p";
+        };
+        dependencies = [ proc-macro2 quote syn ];
+      };
+
+      quote = mkRustCrate rec {
+        name = "quote";
+        version = "1.0.3";
+        src = fetchFromCratesIo {
+          inherit name version;
+          sha256 = "093chkpg7dc8f86kz0hlxzyfxvbix3xpkmlbhilf0wji228ad35c";
+        };
+        dependencies = [ proc-macro2 ];
+        features = [ "proc-macro" ];
+      };
+
+      proc-macro2 = mkRustCrate rec {
+        name = "proc-macro2";
+        version = "1.0.10";
+        src = fetchFromCratesIo {
+          inherit name version;
+          sha256 = "1sb317587iwq1554s0ksap6718w2l73qa07h2amg3716h8llg6zv";
+        };
+        dependencies = [ unicode-xid ];
+        features = [ "proc-macro" ];
+      };
+
+      unicode-xid = mkRustCrate rec {
+        name = "unicode-xid";
+        version = "0.2.0";
+        src = fetchFromCratesIo {
+          inherit name version;
+          sha256 = "1c85gb3p3qhbjvfyjb31m06la4f024jx319k10ig7n47dz2fk8v7";
+        };
+      };
+
+      syn = mkRustCrate rec {
+        name = "syn";
+        version = "1.0.17";
+        src = fetchFromCratesIo {
+          inherit name version;
+          sha256 = "1vd0ixzqffdr6cb49fvwcrhrbd5a9zlrzkifp166fz0ci940ga6h";
+        };
+        dependencies = [ proc-macro2 unicode-xid quote ];
+        features = [ "clone-impls" "derive" "parsing" "printing" "proc-macro" "visit" ];
+      };
+
+    }) {}

mkRustCrate/lib/mkRustCrate/build.sh

@@ -30,20 +30,21 @@ function add_deps {
     local dep_flags=$1; shift
     for dep in ${!dep_type}
     do
-        printf -v$dep_flags "%s --extern %s=%s" \
-               "${!dep_flags}" \
-               "$(crate_name $dep)" \
-               "$dep/lib/lib$(crate_name $dep).rlib"
         stat $dep/lib/deps/* &>/dev/null \
             && cp -dn $dep/lib/deps/* deps \
             || :
         for depinfo in $dep/lib/*.depinfo
         do
             source $depinfo
         done
-        for lib in $dep/lib/*.rlib
+        for lib in $dep/lib/*.{rlib,so}
         do
-            local dest=$(basename $lib .rlib)-$(crate_hash $dep).rlib
+	    local ext=$(filext $lib)
+            printf -v$dep_flags "%s --extern %s=%s" \
+                "${!dep_flags}" \
+                "$(crate_name $dep)" \
+                "$dep/lib/lib$(crate_name $dep).$ext"
+            local dest=$(basename $lib .$ext)-$(crate_hash $dep).$ext
             copy_or_link "$lib" "$dep_dir/$dest"
         done
     done

mkRustCrate/lib/mkRustCrate/install.sh

@@ -12,12 +12,6 @@ needs_deps=
 for f in *
 do
     ext=$(filext $f)
-    if [ -x "$f" ] && ! [ -d "$f" ]
-    then
-        mkdir -p $out/bin
-        cp $f $out/bin
-        continue
-    fi
 
     case $(filext $f) in
         rlib)
@@ -37,7 +31,13 @@ do
             cp $f $out/lib
             ;;
         *)
+            if [ -x "$f" ] && ! [ -d "$f" ]
+            then
+                mkdir -p $out/bin
+                cp $f $out/bin
+            fi
             continue
+            ;;
     esac
 done
 

mkRustCrate/lib/mkRustCrate/util.sh

@@ -38,7 +38,7 @@ function copy_or_link {
     local dest="$1"; shift
     [ -L "$src" ] \
         && cp -dn "$src" "$dest" \
-        || ln -s "$src" "$dest"
+        || ln -s "$src" "$dest" &> /dev/null || true
 }
 
 function parse_depinfo {
@@ -48,7 +48,7 @@ function parse_depinfo {
         [[ "x$line" =~ xcargo:([^=]+)=(.*) ]] || continue
         local key="${BASH_REMATCH[1]}"
         local val="${BASH_REMATCH[2]}"
-        
+
         case $key in
             rustc-link-lib) ;&
             rustc-flags) ;&