diff options
| author | Daniël de Kok <me@danieldk.eu> | 2021-01-27 06:57:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-27 06:57:58 +0100 |
| commit | a49d810552d7d3ec4db41da2313b695b70320b56 (patch) | |
| tree | 5e8404b8ec90e1bcfef211f61e2aaa346f8a25f8 /pkgs | |
| parent | 26c4dcf8fa55e8ace68906e41956494c524e3e22 (diff) | |
| parent | f46bfb972d1313b1c201569e373fe225fb803ae4 (diff) | |
| download | nixpkgs-a49d810552d7d3ec4db41da2313b695b70320b56.tar nixpkgs-a49d810552d7d3ec4db41da2313b695b70320b56.tar.gz nixpkgs-a49d810552d7d3ec4db41da2313b695b70320b56.tar.bz2 nixpkgs-a49d810552d7d3ec4db41da2313b695b70320b56.tar.lz nixpkgs-a49d810552d7d3ec4db41da2313b695b70320b56.tar.xz nixpkgs-a49d810552d7d3ec4db41da2313b695b70320b56.tar.zst nixpkgs-a49d810552d7d3ec4db41da2313b695b70320b56.zip | |
Merge pull request #110861 from danieldk/fix-emacs-trivial-build
emacs.pkgs.trivialBuild: add missing stdenv argument
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/emacs/generic.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/emacs/trivial.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix index 588699517ba..d84fa24923d 100644 --- a/pkgs/build-support/emacs/generic.nix +++ b/pkgs/build-support/emacs/generic.nix @@ -1,6 +1,6 @@ # generic builder for Emacs packages -{ lib, stdenv, emacs, texinfo }: +{ lib, stdenv, emacs, texinfo, ... }: with lib; diff --git a/pkgs/build-support/emacs/trivial.nix b/pkgs/build-support/emacs/trivial.nix index 9a36b44a270..f1aa078df27 100644 --- a/pkgs/build-support/emacs/trivial.nix +++ b/pkgs/build-support/emacs/trivial.nix @@ -1,12 +1,12 @@ # trivial builder for Emacs packages -{ lib, texinfo, ... }@envargs: +{ callPackage, lib, ... }@envargs: with lib; args: -import ./generic.nix envargs ({ +callPackage ./generic.nix envargs ({ buildPhase = '' runHook preBuild |