Merge pull request #293 from lierdakil/cross-compilation-issues

Tweaks to package.nix (particularly pertinent in cross-compilation context)

Author: zimbatm

package.nix

@@ -36,10 +36,11 @@ let
     nativeCheckInputs = [
       clippy
       nix
+      cargo
     ];
 
     preCheck = ''
-      ${lib.getExe cargo} clippy
+      cargo clippy
 
       # Stop the Nix command from trying to create /nix/var/nix/profiles.
       #
@@ -51,17 +52,15 @@ in
 runCommand "system-manager"
   {
     nativeBuildInputs = [ makeBinaryWrapper ];
-    passthru = {
-      # The unwrapped version takes nix from the PATH, it will fail if nix
-      # cannot be found.
-      # The wrapped version has a reference to the nix store path, so nix is
-      # part of its runtime closure.
-      unwrapped = system-manager-unwrapped;
-    };
+    # The unwrapped version takes nix from the PATH, it will fail if nix
+    # cannot be found.
+    # The wrapped version has a reference to the nix store path, so nix is
+    # part of its runtime closure.
+    unwrapped = system-manager-unwrapped;
   }
   ''
     makeWrapper \
-      ${system-manager-unwrapped}/bin/system-manager \
+      $unwrapped/bin/system-manager \
       $out/bin/system-manager \
       --prefix PATH : ${lib.makeBinPath [ nix ]}
   ''