public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #115131 from adisbladis/emacs-pdf-tool-darwin

Browse Source 
emacs.pkgs.pdf-tools: Fix darwin build
This commit is contained in:
adisbladis 2021-03-04 22:26:40 +02:00 committed by GitHub
commit 4003206152
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View File

@ -141,14 +141,18 @@ let
buildInputs = old.buildInputs ++ [ pkgs.libpng pkgs.zlib pkgs.poppler ]; buildInputs = old.buildInputs ++ [ pkgs.libpng pkgs.zlib pkgs.poppler ];
preBuild = '' preBuild = ''
make server/epdfinfo make server/epdfinfo
remove-references-to \ remove-references-to ${lib.concatStringsSep " " (
-t ${pkgs.stdenv.cc.libc.dev} \ map (output: "-t " + output) (
-t ${pkgs.glib.dev} \ [
-t ${pkgs.libpng.dev} \ pkgs.glib.dev
-t ${pkgs.poppler.dev} \ pkgs.libpng.dev
-t ${pkgs.zlib.dev} \ pkgs.poppler.dev
-t ${pkgs.cairo.dev} \ pkgs.zlib.dev
server/epdfinfo pkgs.cairo.dev
]
++ lib.optional pkgs.stdenv.isLinux pkgs.stdenv.cc.libc.dev
)
)} server/epdfinfo
''; '';
recipe = pkgs.writeText "recipe" '' recipe = pkgs.writeText "recipe" ''
(pdf-tools (pdf-tools