diff --git a/packages/genodelabs/default.nix b/packages/genodelabs/default.nix index a3c327a..8b44ad2 100644 --- a/packages/genodelabs/default.nix +++ b/packages/genodelabs/default.nix @@ -59,7 +59,7 @@ let { hash ? "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" , patches ? [ ], extraRepos ? [ ], ... }@args: let - dontUnpack = patches == [ ] and extraRepos == [ ]; + dontUnpack = patches == [ ] && extraRepos == [ ]; version = portVersions.${name} or args.version; in with buildPackages.buildPackages; stdenvNoCC.mkDerivation (args // { @@ -89,12 +89,12 @@ let '' runHook preBuild export CONTRIB_DIR=$NIX_BUILD_TOP/contrib - export GENODE_DIR=${if havePatches then "$(pwd)" else genodeSources} + export GENODE_DIR=${if dontUnpack then genodeSources else "$(pwd)"} + for repo in $extraRepos; do + ln -s $repo $GENODE_DIR/repos/ + done mkdir $CONTRIB_DIR $GENODE_DIR/tool/ports/prepare_port ${name} CHECK_HASH=no - for repo in $extraRepos; do - ln -s ${repo} $GENODE_DIR/repos/ - done runHook postBuild '';