From 27ac4893992cb6ae02e96842686281446e0e0785 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 15 Sep 2024 03:44:42 +0800 Subject: [PATCH] emacs.pkgs.elpaPackages.jinx: move to common overrides --- .../elisp-packages/elpa-common-overrides.nix | 29 +++++++++++++++++++ .../emacs/elisp-packages/elpa-packages.nix | 27 ----------------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix index 6115bb81fed3..2ecdf453abaf 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix @@ -68,6 +68,35 @@ in ''; }); + jinx = super.jinx.overrideAttrs (old: { + dontUnpack = false; + + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.pkg-config ]; + + buildInputs = old.buildInputs or [ ] ++ [ pkgs.enchant2 ]; + + postBuild = + old.postBuild or "" + + "\n" + + '' + NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE" + $CC -shared -o jinx-mod${libExt} jinx-mod.c -lenchant-2 + ''; + + postInstall = + old.postInstall or "" + + "\n" + + '' + outd=$out/share/emacs/site-lisp/elpa/jinx-* + install -m444 -t $outd jinx-mod${libExt} + rm $outd/jinx-mod.c $outd/emacs-module.h + ''; + + meta = old.meta // { + maintainers = [ lib.maintainers.DamienCassou ]; + }; + }); + pq = super.pq.overrideAttrs (old: { buildInputs = old.buildInputs or [ ] ++ [ pkgs.postgresql ]; }); diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 7452d513ef0f..a122211031b9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -57,33 +57,6 @@ self: let else super.org-transclusion; rcirc-menu = markBroken super.rcirc-menu; # Missing file header - jinx = super.jinx.overrideAttrs (old: let - libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; - in { - dontUnpack = false; - - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkgs.pkg-config - ]; - - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.enchant2 ]; - - postBuild = '' - NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE" - $CC -shared -o jinx-mod${libExt} jinx-mod.c -lenchant-2 - ''; - - postInstall = (old.postInstall or "") + "\n" + '' - outd=$out/share/emacs/site-lisp/elpa/jinx-* - install -m444 -t $outd jinx-mod${libExt} - rm $outd/jinx-mod.c $outd/emacs-module.h - ''; - - meta = old.meta // { - maintainers = [ lib.maintainers.DamienCassou ]; - }; - }); - plz = super.plz.overrideAttrs ( old: { dontUnpack = false;