Compare commits
2 Commits
a828a37f43
...
1805cbf46b
| Author | SHA1 | Date | |
|---|---|---|---|
| 1805cbf46b | |||
| fe36dca74a |
@@ -65,6 +65,82 @@ in
|
|||||||
VISUAL = "emacs";
|
VISUAL = "emacs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(final: prev: {
|
||||||
|
skia-aseprite = prev.skia-aseprite.overrideAttrs (old: {
|
||||||
|
postPatch = (old.postPatch or "") + ''
|
||||||
|
sed -i -e 's/"-march=armv7-a",//g' gn/skia/BUILD.gn
|
||||||
|
'';
|
||||||
|
buildInputs = old.buildInputs ++ [
|
||||||
|
final.xcbuild
|
||||||
|
final.darwin.apple_sdk.frameworks.ApplicationServices
|
||||||
|
];
|
||||||
|
meta.maintainers = with pkgs.lib.maintainers; [
|
||||||
|
davidcromp
|
||||||
|
];
|
||||||
|
});
|
||||||
|
aseprite = prev.aseprite.overrideAttrs (old: {
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DENABLE_DESKTOP_INTEGRATION=OFF"
|
||||||
|
"-DENABLE_UPDATER=OFF"
|
||||||
|
"-DUSE_SHARED_CMARK=ON"
|
||||||
|
"-DUSE_SHARED_CURL=ON"
|
||||||
|
"-DUSE_SHARED_FMT=ON"
|
||||||
|
"-DUSE_SHARED_FREETYPE=ON"
|
||||||
|
"-DUSE_SHARED_GIFLIB=ON"
|
||||||
|
"-DUSE_SHARED_HARFBUZZ=ON"
|
||||||
|
"-DUSE_SHARED_JPEGLIB=ON"
|
||||||
|
"-DUSE_SHARED_LIBPNG=ON"
|
||||||
|
"-DPNG_ARM_NEON:STRING=on"
|
||||||
|
"-DUSE_SHARED_LIBWEBP=ON"
|
||||||
|
"-DUSE_SHARED_PIXMAN=ON"
|
||||||
|
"-DUSE_SHARED_TINYXML=ON"
|
||||||
|
"-DUSE_SHARED_WEBP=ON"
|
||||||
|
"-DUSE_SHARED_ZLIB=ON"
|
||||||
|
# Disable libarchive programs.
|
||||||
|
"-DENABLE_CAT=OFF"
|
||||||
|
"-DENABLE_CPIO=OFF"
|
||||||
|
"-DENABLE_TAR=OFF"
|
||||||
|
# UI backend.
|
||||||
|
"-DLAF_OS_BACKEND=skia"
|
||||||
|
"-DLAF_WITH_EXAMPLES=OFF"
|
||||||
|
"-DSKIA_DIR=${final.skia-aseprite}"
|
||||||
|
"-DSKIA_LIBRARY_DIR=${final.skia-aseprite}/lib"
|
||||||
|
"-DSKIA_LIBRARYR=${final.skia-aseprite}/lib/libskia.a"
|
||||||
|
];
|
||||||
|
buildInputs = with pkgs; [
|
||||||
|
cmark
|
||||||
|
curl
|
||||||
|
fmt
|
||||||
|
fontconfig
|
||||||
|
freetype
|
||||||
|
giflib
|
||||||
|
glib
|
||||||
|
harfbuzzFull
|
||||||
|
libjpeg
|
||||||
|
libpng
|
||||||
|
libwebp
|
||||||
|
pcre2
|
||||||
|
pixman
|
||||||
|
skia-aseprite
|
||||||
|
tinyxml-2
|
||||||
|
zlib
|
||||||
|
|
||||||
|
# MacOS:
|
||||||
|
] ++ (with darwin.apple_sdk.frameworks; [
|
||||||
|
Cocoa
|
||||||
|
QuickLook
|
||||||
|
Quartz
|
||||||
|
]);
|
||||||
|
|
||||||
|
hardeningDisable = [
|
||||||
|
"format" # Darwin Specific
|
||||||
|
];
|
||||||
|
meta.broken = false;
|
||||||
|
});
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
environment.systemPackages = (with pkgs; [
|
environment.systemPackages = (with pkgs; [
|
||||||
me-emacs
|
me-emacs
|
||||||
(aspellWithDicts (p: with p;[
|
(aspellWithDicts (p: with p;[
|
||||||
@@ -76,7 +152,7 @@ in
|
|||||||
texliveFull
|
texliveFull
|
||||||
wget
|
wget
|
||||||
|
|
||||||
xquartz
|
#xquartz
|
||||||
kitty
|
kitty
|
||||||
|
|
||||||
btop
|
btop
|
||||||
@@ -90,9 +166,12 @@ in
|
|||||||
tailscale
|
tailscale
|
||||||
discord
|
discord
|
||||||
slack
|
slack
|
||||||
inkscape
|
|
||||||
gimp
|
gimp
|
||||||
|
# aseprite
|
||||||
# TODO: Consider using Yabai??
|
# TODO: Consider using Yabai??
|
||||||
|
|
||||||
|
# Games
|
||||||
|
prismlauncher
|
||||||
]);
|
]);
|
||||||
|
|
||||||
homebrew = {
|
homebrew = {
|
||||||
@@ -110,17 +189,21 @@ in
|
|||||||
"bitwarden"
|
"bitwarden"
|
||||||
"zoom-for-it-admins"
|
"zoom-for-it-admins"
|
||||||
"libreoffice"
|
"libreoffice"
|
||||||
"microsoft-office"
|
|
||||||
"kicad"
|
"kicad"
|
||||||
"tailscale"
|
"tailscale"
|
||||||
"r" "rstudio"
|
"godot"
|
||||||
|
"pixelorama"
|
||||||
|
"blender"
|
||||||
|
"inkscape"
|
||||||
];
|
];
|
||||||
# Apps to install outside of nix for when wanting to test/run
|
# Apps to install outside of nix for when wanting to test/run
|
||||||
# things that... aren't used by other people who use nix, like
|
# things that... aren't used by other people who use nix, like
|
||||||
# python apps (which is why poetry is there)
|
# python apps (which is why poetry is there)
|
||||||
brews = [
|
brews = [
|
||||||
"poetry"
|
"poetry"
|
||||||
|
"pdm"
|
||||||
"python@3.11"
|
"python@3.11"
|
||||||
|
"python@3.10"
|
||||||
"pygments"
|
"pygments"
|
||||||
# sudo ln -sfn /opt/homebrew/opt/openjdk/libexec/openjdk.jdk \
|
# sudo ln -sfn /opt/homebrew/opt/openjdk/libexec/openjdk.jdk \
|
||||||
# /Library/Java/JavaVirtualMachines/openjdk.jdk
|
# /Library/Java/JavaVirtualMachines/openjdk.jdk
|
||||||
|
|||||||
Reference in New Issue
Block a user