b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #224238 from DamienCassou/jinx-build

Browse source
This commit is contained in:
Damien Cassou 2023-04-04 11:40:41 +02:00 committed by GitHub
parent 0b7f87614b 1b5ba6d5bd
commit 730ac7ea62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
View file

@ -106,6 +106,31 @@ self: let
};
});
jinx = super.jinx.overrideAttrs (old: {
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.so jinx-mod.c -lenchant-2
'';
postInstall = (old.postInstall or "") + "\n" + ''
outd=$out/share/emacs/site-lisp/elpa/jinx-*
install -m444 -t $outd jinx-mod.so
rm $outd/jinx-mod.c $outd/emacs-module.h
'';
meta = old.meta // {
maintainers = [ lib.maintainers.DamienCassou ];
};
});
plz = super.plz.overrideAttrs (
old: {
dontUnpack = false;

27
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
View file

@ -314,6 +314,33 @@ let
ivy-rtags = fix-rtags super.ivy-rtags;
jinx = super.jinx.overrideAttrs (old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
pkgs.pkg-config
];
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.enchant2 ];
postBuild = ''
pushd working/jinx
NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE"
$CC -shared -o jinx-mod.so jinx-mod.c -lenchant-2
popd
'';
postInstall = (old.postInstall or "") + "\n" + ''
pushd source
outd=$(echo $out/share/emacs/site-lisp/elpa/jinx-*)
install -m444 --target-directory=$outd jinx-mod.so
rm $outd/jinx-mod.c $outd/emacs-module.h
popd
'';
meta = old.meta // {
maintainers = [ lib.maintainers.DamienCassou ];
};
});
libgit = super.libgit.overrideAttrs(attrs: {
nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ pkgs.cmake ];
buildInputs = attrs.buildInputs ++ [ pkgs.libgit2 ];