From dd85a3d89ca1933b428846f20267b90e504b3a6c Mon Sep 17 00:00:00 2001 From: Wolfgang Thaller Date: Sat, 27 Nov 2021 01:32:30 +0100 Subject: [PATCH] simplify --- default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/default.nix b/default.nix index 58ad98c233..e463c0e9b9 100644 --- a/default.nix +++ b/default.nix @@ -74,7 +74,6 @@ let retro68 = true; }; -in rec { # A Nixpkgs overlay. overlay = pkgs: prev: { @@ -228,7 +227,6 @@ in rec { export CMAKE_TOOLCHAIN_FILE=${toolchain} retro68_addRIncludes() { - echo "retro68_addRIncludes: $1 $depHostOffset" case $depHostOffset in -1) local role='BUILD_' ;; 0) local role="" ;; @@ -242,7 +240,6 @@ in rec { fi } - echo "targetOffset: $targetOffset" addEnvHooks "$targetOffset" retro68_addRIncludes '' + (pkgs.lib.optionalString (systemName == "Retro68") '' @@ -340,4 +337,7 @@ in rec { nativeBuildInputs = [ pkgs.hfsutils pkgs.retro68_tools pkgs.cmake pkgs.gnumake ]; }) crossPkgs; -} + + in { + inherit overlay crossPkgs shell; + }