Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Touchup Mac builds and Nix flake #1941

Merged
merged 2 commits into from
Dec 21, 2023
Merged

Touchup Mac builds and Nix flake #1941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0571be
fix(build): Adjust macfonts module to more robustly import AppKit
alerque Dec 19, 2023
b6a7967
chore(build): Drop obsolete Nix flake workaround
alerque Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions build-aux/pkg.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,6 @@ in stdenv.mkDerivation (finalAttrs: {

postPatch = ''
patchShebangs build-aux/*.sh build-aux/git-version-gen
'' + lib.optionalString stdenv.isDarwin ''
sed -i -e 's|@import AppKit;|#import <AppKit/AppKit.h>|' src/macfonts.m
'';

NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit";
alerque marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -140,15 +138,6 @@ in stdenv.mkDerivation (finalAttrs: {
touch source/build-aux/rust_boilerplate.mk
'';

# remove forbidden references to $TMPDIR
preFixup = lib.optionalString stdenv.isLinux ''
for f in "$out"/bin/*; do
if isELF "$f"; then
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f"
fi
done
'';

passthru = {
# So it will be easier to inspect this environment, in comparison to others
inherit luaEnv;
Expand Down
3 changes: 2 additions & 1 deletion justenough/macfonts.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import AppKit;
#import <AppKit/AppKit.h>

#include <stdio.h>
#include <lua.h>
#include <lauxlib.h>
Expand Down
Loading