diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2022-08-22 01:38:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-22 12:08:50 +0530 |
| commit | c3d227c11bbeb18ea494fa832d0f23f71ccf9a9d (patch) | |
| tree | d249bdd5e5a4f08f1c36ab40b4f1ab9690156514 /server/autobuild | |
| parent | 6df41605cccb6f267693927dc153e7f0ae0c980d (diff) | |
Don't depend on gcc when building with `nix-shell` (#135)
* Use `--run` flag to execute nix-shell
The `--command` flag is only required to spawn a interactive shell.
* Do not require gcc to build with nix-shell
`nix-shell` already sets CC with a C compiler, for instance Clang on darwin.
* Remove outdated require in test-helper
`f.el` is not needed anywhere.
Diffstat (limited to 'server/autobuild')
| -rwxr-xr-x | server/autobuild | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/autobuild b/server/autobuild index 1dcdff0..57d596b 100755 --- a/server/autobuild +++ b/server/autobuild @@ -383,8 +383,8 @@ os_nixos() { command="AUTOBUILD_NIX_SHELL=true" command="$command;export AUTOBUILD_NIX_SHELL" command="$command;$(quote "$0" "$@")" - exec nix-shell --pure --command "$command" \ - -p gcc gnumake automake autoconf pkgconfig libpng zlib poppler + exec nix-shell --pure --run "$command" \ + -p automake autoconf pkgconfig libpng zlib poppler } # Gentoo |