mirror of
https://github.com/nix-community/emacs-overlay.git
synced 2025-12-06 02:40:25 -08:00
Remove 20.03 compat hacks
This commit is contained in:
parent
49d66e8d26
commit
28af2c8daa
1 changed files with 0 additions and 24 deletions
24
default.nix
24
default.nix
|
|
@ -60,30 +60,6 @@ let
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
# Stable compat
|
|
||||||
(
|
|
||||||
drv:
|
|
||||||
let
|
|
||||||
# The nativeComp passthru attribute is used a heuristic to check if we're on 20.03 or older
|
|
||||||
isStable = !(super.lib.hasAttr "nativeComp" (drv.passthru or { }));
|
|
||||||
withX = super.lib.elem "--with-xft" drv.configureFlags;
|
|
||||||
in
|
|
||||||
if isStable then drv.overrideAttrs (
|
|
||||||
old: {
|
|
||||||
|
|
||||||
configureFlags = old.configureFlags
|
|
||||||
++ super.lib.optional withX "--with-cairo";
|
|
||||||
|
|
||||||
buildInputs = old.buildInputs ++ [
|
|
||||||
self.harfbuzz.dev
|
|
||||||
self.jansson
|
|
||||||
]
|
|
||||||
++ super.lib.optional withX self.cairo;
|
|
||||||
|
|
||||||
}
|
|
||||||
) else drv
|
|
||||||
)
|
|
||||||
|
|
||||||
# reconnect pkgs to the built emacs
|
# reconnect pkgs to the built emacs
|
||||||
(
|
(
|
||||||
drv: let
|
drv: let
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue