dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

emacs.pkgs.elpaPackages.ada-mode: move to common overrides

Browse Source
This commit is contained in:
Lin Jian 2024-09-15 01:56:08 +08:00
parent b525bba371
commit 6ed5ec71bf
No known key found for this signature in database
GPG Key ID: A6698D36434F75A5
3 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
View File

@ -1,4 +1,4 @@
pkgs:
pkgs: lib: buildPackages:
self: super:
@ -11,6 +11,49 @@ in
tle = null; # builtin
advice = null; # builtin
# Compilation instructions for the Ada executables:
# https://www.nongnu.org/ada-mode/
ada-mode = super.ada-mode.overrideAttrs (
finalAttrs: previousAttrs: {
# actually unpack source of ada-mode and wisi
# which are both needed to compile the tools
# we need at runtime
dontUnpack = false;
srcs = [
super.ada-mode.src
self.wisi.src
];
sourceRoot = "ada-mode-${finalAttrs.version}";
nativeBuildInputs = previousAttrs.nativeBuildInputs or [ ] ++ [
buildPackages.gnat
buildPackages.gprbuild
buildPackages.dos2unix
buildPackages.re2c
];
buildInputs = previousAttrs.buildInputs or [ ] ++ [ pkgs.gnatPackages.gnatcoll-xref ];
buildPhase = ''
runHook preBuild
./build.sh -j$NIX_BUILD_CORES
runHook postBuild
'';
postInstall =
previousAttrs.postInstall or ""
+ "\n"
+ ''
./install.sh "$out"
'';
meta = previousAttrs.meta // {
maintainers = [ lib.maintainers.sternenseemann ];
};
}
);
# TODO delete this when we get upstream fix https://debbugs.gnu.org/cgi/bugreport.cgi?bug=73241
eglot = super.eglot.overrideAttrs (old: {
postInstall =

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

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

41
pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
View File

@ -47,7 +47,7 @@ self: let
super = imported;
commonOverrides = import ./elpa-common-overrides.nix pkgs;
commonOverrides = import ./elpa-common-overrides.nix pkgs lib buildPackages;
overrides = self: super: {
# upstream issue: Wrong type argument: arrayp, nil
@ -56,45 +56,6 @@ self: let
then markBroken super.org-transclusion
else super.org-transclusion;
rcirc-menu = markBroken super.rcirc-menu; # Missing file header
# Compilation instructions for the Ada executables:
# https://www.nongnu.org/ada-mode/
ada-mode = super.ada-mode.overrideAttrs (old: {
# actually unpack source of ada-mode and wisi
# which are both needed to compile the tools
# we need at runtime
dontUnpack = false;
srcs = [
super.ada-mode.src
self.wisi.src
];
sourceRoot = "ada-mode-${self.ada-mode.version}";
nativeBuildInputs = old.nativeBuildInputs ++ [
buildPackages.gnat
buildPackages.gprbuild
buildPackages.dos2unix
buildPackages.re2c
];
buildInputs = old.buildInputs ++ [
pkgs.gnatPackages.gnatcoll-xref
];
buildPhase = ''
runHook preBuild
./build.sh -j$NIX_BUILD_CORES
runHook postBuild
'';
postInstall = (old.postInstall or "") + "\n" + ''
./install.sh "$out"
'';
meta = old.meta // {
maintainers = [ lib.maintainers.sternenseemann ];
};
});
jinx = super.jinx.overrideAttrs (old: let
libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary;