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

emacs-packages: Drop manually packaged pdf-tools

Browse Source 
Use autogenerated package from melpa
This commit is contained in:
adisbladis 2019-08-04 17:55:15 +01:00
parent 48428ce6ec
commit f7627be844
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
3 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
*/ */
{ lib, external }: variant: self: let { lib, external, pkgs }: variant: self: let
dontConfigure = pkg: if pkg != null then pkg.override (args: { dontConfigure = pkg: if pkg != null then pkg.override (args: {
melpaBuild = drv: args.melpaBuild (drv // { melpaBuild = drv: args.melpaBuild (drv // {
@ -76,6 +76,17 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# build timeout # build timeout
graphene = markBroken super.graphene; graphene = markBroken super.graphene;
pdf-tools = super.pdf-tools.overrideAttrs(old: {
nativeBuildInputs = [ external.pkgconfig ];
buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ];
preBuild = "make server/epdfinfo";
recipe = pkgs.writeText "recipe" ''
(pdf-tools
:repo "politza/pdf-tools" :fetcher github
:files ("lisp/pdf-*.el" "server/epdfinfo"))
'';
});
# Build same version as Haskell package # Build same version as Haskell package
hindent = super.hindent.overrideAttrs (attrs: { hindent = super.hindent.overrideAttrs (attrs: {
version = external.hindent.version; version = external.hindent.version;

2
pkgs/top-level/all-packages.nix
View File

@ -17928,7 +17928,7 @@ in
emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26 pkgs.emacs26Packages); emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26 pkgs.emacs26Packages);
emacsPackagesNgFor = emacs: import ./emacs-packages.nix { emacsPackagesNgFor = emacs: import ./emacs-packages.nix {
inherit lib newScope stdenv; inherit lib newScope stdenv pkgs;
inherit fetchFromGitHub fetchurl; inherit fetchFromGitHub fetchurl;
inherit emacs texinfo makeWrapper runCommand writeText; inherit emacs texinfo makeWrapper runCommand writeText;
inherit (xorg) lndir; inherit (xorg) lndir;

27
pkgs/top-level/emacs-packages.nix
View File

@ -39,6 +39,7 @@
, melpaBuild , melpaBuild
, external , external
, pkgs
}: }:
with lib.licenses; with lib.licenses;
@ -51,7 +52,7 @@ let
# Contains both melpa stable & unstable # Contains both melpa stable & unstable
melpaGeneric = import ../applications/editors/emacs-modes/melpa-packages.nix { melpaGeneric = import ../applications/editors/emacs-modes/melpa-packages.nix {
inherit external lib; inherit external lib pkgs;
}; };
melpaStablePackages = self: let melpaStablePackages = self: let
@ -76,30 +77,6 @@ let
## START HERE ## START HERE
pdf-tools = melpaBuild rec {
pname = "pdf-tools";
version = "0.90";
src = fetchFromGitHub {
owner = "politza";
repo = "pdf-tools";
rev = "v${version}";
sha256 = "0iv2g5kd14zk3r5dzdw7b7hk4b5w7qpbilcqkja46jgxbb6xnpl9";
};
nativeBuildInputs = [ external.pkgconfig ];
buildInputs = with external; [ autoconf automake libpng zlib poppler ];
preBuild = "make server/epdfinfo";
recipe = writeText "recipe" ''
(pdf-tools
:repo "politza/pdf-tools" :fetcher github
:files ("lisp/pdf-*.el" "server/epdfinfo"))
'';
packageRequires = [ tablist let-alist ];
meta = {
description = "Emacs support library for PDF files";
license = gpl3;
};
};
elisp-ffi = melpaBuild rec { elisp-ffi = melpaBuild rec {
pname = "elisp-ffi"; pname = "elisp-ffi";
version = "1.0.0"; version = "1.0.0";