diff options
author | adisbladis <adisbladis@gmail.com> | 2019-08-04 17:55:15 +0100 |
---|---|---|
committer | adisbladis <adisbladis@gmail.com> | 2019-08-07 18:04:21 +0100 |
commit | f7627be84404b4abcf76209e0036506dffb03259 (patch) | |
tree | 148e60b2a99d63634632862318d0ad5d01519c12 /pkgs | |
parent | 48428ce6ec77bc1eba0064e8e5675848bcbf1c82 (diff) |
emacs-packages: Drop manually packaged pdf-tools
Use autogenerated package from melpa
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/emacs-packages.nix | 27 |
3 files changed, 15 insertions, 27 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index f548b3372b818..9d9134e51a9f4 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -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: { melpaBuild = drv: args.melpaBuild (drv // { @@ -76,6 +76,17 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # build timeout 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 hindent = super.hindent.overrideAttrs (attrs: { version = external.hindent.version; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25515fe593c2a..cf7ba86af89da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17928,7 +17928,7 @@ in emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26 pkgs.emacs26Packages); emacsPackagesNgFor = emacs: import ./emacs-packages.nix { - inherit lib newScope stdenv; + inherit lib newScope stdenv pkgs; inherit fetchFromGitHub fetchurl; inherit emacs texinfo makeWrapper runCommand writeText; inherit (xorg) lndir; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 3b299502fb417..5547e01cd1551 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -39,6 +39,7 @@ , melpaBuild , external +, pkgs }: with lib.licenses; @@ -51,7 +52,7 @@ let # Contains both melpa stable & unstable melpaGeneric = import ../applications/editors/emacs-modes/melpa-packages.nix { - inherit external lib; + inherit external lib pkgs; }; melpaStablePackages = self: let @@ -76,30 +77,6 @@ let ## 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 { pname = "elisp-ffi"; version = "1.0.0"; |