fixes (vkquake don't relink, emacs and darwin packages)

This commit is contained in:
willemml 2023-04-11 00:46:24 -07:00
parent 62e9af71b8
commit 2c64a07b45
Signed by: willemml
GPG key ID: C3DE5DF6198DACBD
3 changed files with 1 additions and 25 deletions

View file

@ -124,7 +124,6 @@ in {
yq yq
zsh-completions zsh-completions
] ]
++ lib.optionals stdenv.isDarwin darwin
++ lib.optionals stdenv.isLinux linux ++ lib.optionals stdenv.isLinux linux
++ node-packages; ++ node-packages;
} }

View file

@ -114,24 +114,16 @@
]) ])
++ (with pkgs; [ ++ (with pkgs; [
gnuplot gnuplot
mu
plantuml plantuml
sqlite sqlite
])); ]));
emacsConfig = pkgs.emacsWithPackagesFromUsePackage {
config = ./init.el;
defaultInitFile = true;
package = emacsPackage;
};
in { in {
home.file.".emacs.d/early-init.el".source = ./early-init.el; home.file.".emacs.d/early-init.el".source = ./early-init.el;
home.file.".emacs.d/init.el".source = ./init.el; home.file.".emacs.d/init.el".source = ./init.el;
programs.emacs.enable = true; programs.emacs.enable = true;
programs.emacs.package = emacsConfig; programs.emacs.package = emacsPackage;
services.emacs = pkgs.lib.mkIf pkgs.stdenv.isLinux { services.emacs = pkgs.lib.mkIf pkgs.stdenv.isLinux {
enable = true; enable = true;

View file

@ -50,21 +50,6 @@ stdenv.mkDerivation {
chmod -R a+rw vkQuake.app chmod -R a+rw vkQuake.app
ls ls
cp build/vkquake vkQuake.app/Contents/Resources/vkquake 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 = '' installPhase = ''