[nongnu] elpa/pdf-tools c3d227c11b 2/3: Don't depend on gcc when building with `nix-shell` (#135)

[ELPA Syncer]

branch: elpa/pdf-tools
commit c3d227c11bbeb18ea494fa832d0f23f71ccf9a9d
Author: Mario Rodas <marsam@users.noreply.github.com>
Commit: GitHub <noreply@github.com>

    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.
---
 server/autobuild    | 4 ++--
 test/test-helper.el | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/server/autobuild b/server/autobuild
index 1dcdff07e7..57d596bfa4 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
diff --git a/test/test-helper.el b/test/test-helper.el
index da01765896..a3be618440 100644
--- a/test/test-helper.el
+++ b/test/test-helper.el
@@ -91,7 +91,6 @@
   `(pdf-test-with-pdf "encrypted.pdf" ,@body))
 
 ;; ---
-(require 'f)
 (require 'undercover)
 (undercover "lisp/*.el")
 (require 'let-alist)