From 28af2c8daa8cc35601e9e45d651bd36234455524 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 26 Feb 2021 23:35:18 +0200 Subject: Remove 20.03 compat hacks --- default.nix | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'default.nix') diff --git a/default.nix b/default.nix index c88ced2d3932..e0140992bd14 100644 --- a/default.nix +++ b/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 ( drv: let -- cgit 1.4.1