diff options
| author | adisbladis <adisbladis@gmail.com> | 2021-02-26 23:35:18 +0200 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2021-02-26 23:35:18 +0200 |
| commit | 28af2c8daa8cc35601e9e45d651bd36234455524 (patch) | |
| tree | 3bb65c746c631c12c6a3b6b56813f0b22cd3d5f6 /default.nix | |
| parent | 49d66e8d26b76233743fd112579b26867738d15e (diff) | |
| download | nixlib-28af2c8daa8cc35601e9e45d651bd36234455524.tar nixlib-28af2c8daa8cc35601e9e45d651bd36234455524.tar.gz nixlib-28af2c8daa8cc35601e9e45d651bd36234455524.tar.bz2 nixlib-28af2c8daa8cc35601e9e45d651bd36234455524.tar.lz nixlib-28af2c8daa8cc35601e9e45d651bd36234455524.tar.xz nixlib-28af2c8daa8cc35601e9e45d651bd36234455524.tar.zst nixlib-28af2c8daa8cc35601e9e45d651bd36234455524.zip | |
Remove 20.03 compat hacks
Diffstat (limited to 'default.nix')
| -rw-r--r-- | default.nix | 24 |
1 files changed, 0 insertions, 24 deletions
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 |