From f46bfb972d1313b1c201569e373fe225fb803ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 26 Jan 2021 15:57:21 +0100 Subject: [PATCH] emacs.pkgs.trivialBuild: add missing stdenv argument Fix fallout of #110687 (generic.nix requires stdenv). --- pkgs/build-support/emacs/generic.nix | 2 +- 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