diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2016-05-13 11:58:24 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-05-13 11:58:24 -0500 |
commit | 21efdd800358ded599f1d11acb0064ce9bff7f5d (patch) | |
tree | 3ceef4426be80bc1fa9a426965d6da8541287ca5 /pkgs/top-level | |
parent | 5e694aa3b377fdf9bcf35088f82434b126a0f3ee (diff) | |
parent | 67394f91528e8e7031de1174b56619ae56cddd01 (diff) | |
download | nixpkgs-21efdd800358ded599f1d11acb0064ce9bff7f5d.tar nixpkgs-21efdd800358ded599f1d11acb0064ce9bff7f5d.tar.gz nixpkgs-21efdd800358ded599f1d11acb0064ce9bff7f5d.tar.bz2 nixpkgs-21efdd800358ded599f1d11acb0064ce9bff7f5d.tar.lz nixpkgs-21efdd800358ded599f1d11acb0064ce9bff7f5d.tar.xz nixpkgs-21efdd800358ded599f1d11acb0064ce9bff7f5d.tar.zst nixpkgs-21efdd800358ded599f1d11acb0064ce9bff7f5d.zip |
Merge pull request #15420 from samuelrivas/emacs-wrapper
emacs: hide wrapper dependencies
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/emacs-packages.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60ea94f2b5d..b31b2b8c8fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12399,7 +12399,7 @@ in inherit lib newScope stdenv; inherit fetchFromGitHub fetchgit fetchhg fetchurl; - inherit emacs texinfo makeWrapper; + inherit emacs texinfo makeWrapper runCommand; inherit (xorg) lndir; trivialBuild = callPackage ../build-support/emacs/trivial.nix { diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 426a2a4185b..9c0f8a1f10c 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -34,7 +34,7 @@ { overrides -, lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg +, lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, runCommand , emacs, texinfo, lndir, makeWrapper , trivialBuild @@ -64,7 +64,7 @@ let }; emacsWithPackages = import ../build-support/emacs/wrapper.nix { - inherit lib lndir makeWrapper stdenv; + inherit lib lndir makeWrapper stdenv runCommand; }; packagesFun = self: with self; { |