From e92d63eecea429b705b1c1e60d3334596ea5989c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Mar 2021 21:47:37 +0200 Subject: [PATCH] emacs.pkgs.pdf-tools: Fix darwin build As reported in https://github.com/NixOS/nixpkgs/pull/114484#discussion_r587722662 --- .../editors/emacs-modes/melpa-packages.nix | 20 +++++++++++-------- 1 file 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 6a099639d59..e5e2bac964f 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