diff options
author | adisbladis <adisbladis@gmail.com> | 2021-03-04 22:26:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-04 22:26:40 +0200 |
commit | 4003206152592b239d8bd02dca4fdb3966a880d8 (patch) | |
tree | f8b5f2b6482cb0579fed96708b452bceef6b627d /pkgs/applications | |
parent | 677af53363765797c6f4323494200b53828b53b3 (diff) | |
parent | e92d63eecea429b705b1c1e60d3334596ea5989c (diff) |
Merge pull request #115131 from adisbladis/emacs-pdf-tool-darwin
emacs.pkgs.pdf-tools: Fix darwin build
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 6a099639d5915..e5e2bac964f37 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -141,14 +141,18 @@ let buildInputs = old.buildInputs ++ [ pkgs.libpng pkgs.zlib pkgs.poppler ]; preBuild = '' make server/epdfinfo - remove-references-to \ - -t ${pkgs.stdenv.cc.libc.dev} \ - -t ${pkgs.glib.dev} \ - -t ${pkgs.libpng.dev} \ - -t ${pkgs.poppler.dev} \ - -t ${pkgs.zlib.dev} \ - -t ${pkgs.cairo.dev} \ - server/epdfinfo + remove-references-to ${lib.concatStringsSep " " ( + map (output: "-t " + output) ( + [ + pkgs.glib.dev + pkgs.libpng.dev + pkgs.poppler.dev + pkgs.zlib.dev + pkgs.cairo.dev + ] + ++ lib.optional pkgs.stdenv.isLinux pkgs.stdenv.cc.libc.dev + ) + )} server/epdfinfo ''; recipe = pkgs.writeText "recipe" '' (pdf-tools |