From 56f7011adac3952f739fd12521acfd70e087a606 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 17 May 2023 23:59:43 +0000 Subject: [PATCH] cross: samba: don't patch --- hosts/common/cross/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hosts/common/cross/default.nix b/hosts/common/cross/default.nix index 3c731cc0..7b024df1 100644 --- a/hosts/common/cross/default.nix +++ b/hosts/common/cross/default.nix @@ -1286,15 +1286,15 @@ in # rmlint is scons; it reads the CC environment variable, though, so *may* be cross compilable inherit (emulated) stdenv; }; - samba = prev.samba.overrideAttrs (_upstream: { - # we get "cannot find C preprocessor: aarch64-unknown-linux-gnu-cpp", but ONLY when building with the ccache stdenv. - # this solves that, but `CPP` must be a *single* path -- not an expression. - # i do not understand how the original error arises, as my ccacheStdenv should match the API of the base stdenv (except for cpp being a symlink??). - # but oh well, this fixes it. - CPP = next.buildPackages.writeShellScript "cpp" '' - exec ${lib.getBin next.stdenv.cc}/bin/${next.stdenv.cc.targetPrefix}cc -E $@; - ''; - }); + # samba = prev.samba.overrideAttrs (_upstream: { + # # we get "cannot find C preprocessor: aarch64-unknown-linux-gnu-cpp", but ONLY when building with the ccache stdenv. + # # this solves that, but `CPP` must be a *single* path -- not an expression. + # # i do not understand how the original error arises, as my ccacheStdenv should match the API of the base stdenv (except for cpp being a symlink??). + # # but oh well, this fixes it. + # CPP = next.buildPackages.writeShellScript "cpp" '' + # exec ${lib.getBin next.stdenv.cc}/bin/${next.stdenv.cc.targetPrefix}cc -E $@; + # ''; + # }); # sequoia = prev.sequoia.override { # # fails to fix original error # inherit (emulated) stdenv;