mirror of
https://github.com/willemml/dotfiles.nix.git
synced 2025-04-12 11:17:17 +00:00
fixes (vkquake don't relink, emacs and darwin packages)
This commit is contained in:
parent
62e9af71b8
commit
2c64a07b45
3 changed files with 1 additions and 25 deletions
|
@ -124,7 +124,6 @@ in {
|
|||
yq
|
||||
zsh-completions
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin darwin
|
||||
++ lib.optionals stdenv.isLinux linux
|
||||
++ node-packages;
|
||||
}
|
||||
|
|
|
@ -114,24 +114,16 @@
|
|||
])
|
||||
++ (with pkgs; [
|
||||
gnuplot
|
||||
mu
|
||||
plantuml
|
||||
sqlite
|
||||
]));
|
||||
emacsConfig = pkgs.emacsWithPackagesFromUsePackage {
|
||||
config = ./init.el;
|
||||
|
||||
defaultInitFile = true;
|
||||
|
||||
package = emacsPackage;
|
||||
};
|
||||
in {
|
||||
home.file.".emacs.d/early-init.el".source = ./early-init.el;
|
||||
home.file.".emacs.d/init.el".source = ./init.el;
|
||||
|
||||
programs.emacs.enable = true;
|
||||
|
||||
programs.emacs.package = emacsConfig;
|
||||
programs.emacs.package = emacsPackage;
|
||||
|
||||
services.emacs = pkgs.lib.mkIf pkgs.stdenv.isLinux {
|
||||
enable = true;
|
||||
|
|
|
@ -50,21 +50,6 @@ stdenv.mkDerivation {
|
|||
chmod -R a+rw vkQuake.app
|
||||
ls
|
||||
cp build/vkquake vkQuake.app/Contents/Resources/vkquake
|
||||
mkdir vkQuake.app/Contents/Frameworks
|
||||
otool -L build/vkquake |
|
||||
rg nix |
|
||||
cut -f1 -d' ' |
|
||||
awk '{$1=$1};1' |
|
||||
sort |
|
||||
uniq |
|
||||
xargs -I {} cp {} vkQuake.app/Contents/Frameworks/.
|
||||
otool -L vkQuake.app/Contents/Frameworks/* |
|
||||
rg nix |
|
||||
cut -f1 -d' ' |
|
||||
awk '{$1=$1};1' |
|
||||
sort |
|
||||
uniq |
|
||||
xargs -I {} cp -u {} vkQuake.app/Contents/Frameworks/.
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
Loading…
Add table
Reference in a new issue