nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 19:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

emacsPackages: fix build for nongnu packages

Browse Source
This commit is contained in:
Lin Jian 2024-09-23 14:18:10 +08:00
parent 656c68d654
commit e48a0365d2
No known key found for this signature in database
GPG Key ID: A6698D36434F75A5
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix
View File

@ -1,8 +1,25 @@
pkgs:
pkgs: lib:
self: super:
let
inherit (import ./lib-override-helper.nix pkgs lib)
addPackageRequires
;
in
{
# missing optional dependencies
haskell-tng-mode = addPackageRequires super.haskell-tng-mode (
with self;
[
s
company
projectile
smartparens
yasnippet
]
);
p4-16-mode = super.p4-16-mode.overrideAttrs {
# workaround https://github.com/NixOS/nixpkgs/issues/301795
prePatch = ''

14
pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix
View File

@ -19,6 +19,10 @@
self:
let
inherit (import ./lib-override-helper.nix pkgs lib)
addPackageRequires
;
generateNongnu = lib.makeOverridable (
{
generated ? ./nongnu-devel-generated.nix,
@ -39,9 +43,15 @@ let
super = imported;
commonOverrides = import ./nongnu-common-overrides.nix pkgs;
commonOverrides = import ./nongnu-common-overrides.nix pkgs lib;
overrides = self: super: { };
overrides = self: super: {
# missing optional dependencies
haskell-tng-mode = addPackageRequires super.haskell-tng-mode [
self.shut-up
self.lsp-mode
];
};
in
let

2
pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix
View File

@ -29,7 +29,7 @@ self: let
super = imported;
commonOverrides = import ./nongnu-common-overrides.nix pkgs;
commonOverrides = import ./nongnu-common-overrides.nix pkgs lib;
overrides = self: super: { };