From 9438548689f6a5ece83607312b75e513683fe031 Mon Sep 17 00:00:00 2001 From: duli Date: Thu, 8 Aug 2024 21:56:10 +0800 Subject: [PATCH] emacs: fix missing ccache libary path If we only override stdenv with ccacheStdenv, we will miss libgcc. However, both stdenv and ccacheStdenv can find libgcc in cc.cc.lib. related issue: #303625 --- pkgs/applications/editors/emacs/make-emacs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 868079e037f0..f995b073d377 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -136,8 +136,8 @@ let libGccJitLibraryPaths = [ "${lib.getLib libgccjit}/lib/gcc" "${lib.getLib stdenv.cc.libc}/lib" - ] ++ lib.optionals (stdenv.cc?cc.libgcc) [ - "${lib.getLib stdenv.cc.cc.libgcc}/lib" + ] ++ lib.optionals (stdenv.cc?cc.lib.libgcc) [ + "${lib.getLib stdenv.cc.cc.lib.libgcc}/lib" ]; inherit (if variant == "macport"