gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #335476 from linj-fork/pr/fix-p4-16-mode

Browse Source 
emacsPackages.p4-16-mode: fix build
This commit is contained in:
adisbladis
2024-08-18 16:32:21 +12:00
committed by GitHub
parent 14c37f1b7c 8f295e4d42
commit 863e039d2d
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix
+17 -1
View File
@@ -35,7 +35,23 @@ let
super = imported;
overrides = { };
overrides = {
p4-16-mode = super.p4-16-mode.overrideAttrs {
# workaround https://github.com/NixOS/nixpkgs/issues/301795
prePatch = ''
mkdir tmp-untar-dir
pushd tmp-untar-dir
tar --extract --verbose --file=$src
content_directory=$(echo p4-16-mode-*)
cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el
src=$PWD/$content_directory.tar
tar --create --verbose --file=$src $content_directory
popd
'';
};
};
in
super // overrides
pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix
+15
View File
@@ -30,6 +30,21 @@ self: let
super = imported;
overrides = {
p4-16-mode = super.p4-16-mode.overrideAttrs {
# workaround https://github.com/NixOS/nixpkgs/issues/301795
prePatch = ''
mkdir tmp-untar-dir
pushd tmp-untar-dir
tar --extract --verbose --file=$src
content_directory=$(echo p4-16-mode-*)
cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el
src=$PWD/$content_directory.tar
tar --create --verbose --file=$src $content_directory
popd
'';
};
};
in super // overrides);