vinzenz/servicepoint-simulator
0
0
Fork 0
mirror of https://github.com/kaesaecracker/servicepoint-simulator.git synced 2025-01-18 02:20:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

update flake, use correct nix dependencies instead of non-default fontkit features

Browse source
This commit is contained in:
Vinzenz Schroeter 2025-01-09 22:50:56 +01:00
parent 24d1c54299
commit 398cb8c165
4 changed files with 27 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Cargo.lock generated
View file

@ -648,7 +648,6 @@ dependencies = [
"dirs",
"dwrote",
"float-ord",
"freetype",
"freetype-sys",
"lazy_static",
"libc",
@ -687,16 +686,6 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
[[package]]
name = "freetype"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a440748e063798e4893ceb877151e84acef9bea9a8c6800645cf3f1b3a7806e"
dependencies = [
"freetype-sys",
"libc",
]
[[package]]
name = "freetype-sys"
version = "0.20.1"

9
Cargo.toml
View file

@ -14,6 +14,7 @@ clap = { version = "4.5", features = ["derive"] }
pixels = "0.14"
# I should not need this as a direct dependency, but then I cannot spell the types needed to use font-kit...
pathfinder_geometry = "0.5.1"
font-kit = "0.14.2"
[dependencies.servicepoint]
version = "0.12.0"
@ -24,11 +25,3 @@ version = "0.30"
features = ["rwh_05"]
default-features = true
[target.'cfg(target_os = "linux")'.dependencies.font-kit]
version = "0.14.2"
features = ["loader-freetype-default", "source-fontconfig-dlopen"]
default-features = false
[target.'cfg(target_os = "macos")'.dependencies.font-kit]
version = "0.14.2"
default-features = true

14
flake.lock
View file

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1721727458,
"narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=",
"lastModified": 1736429655,
"narHash": "sha256-BwMekRuVlSB9C0QgwKMICiJ5EVbLGjfe4qyueyNQyGI=",
"owner": "nix-community",
"repo": "naersk",
"rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11",
"rev": "0621e47bd95542b8e1ce2ee2d65d6a1f887a13ce",
"type": "github"
},
"original": {
@ -37,16 +37,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1732749044,
"narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=",
"lastModified": 1736200483,
"narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
"rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.05",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}

26
flake.nix
View file

@ -2,7 +2,7 @@
description = "Flake for servicepoint-simulator";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nix-filter.url = "github:numtide/nix-filter";
naersk = {
url = "github:nix-community/naersk";
@ -70,13 +70,25 @@
with pkgs;
[
xe
lzma
xz
]
++ (lib.optionals pkgs.stdenv.isLinux (
++ lib.optionals pkgs.stdenv.isLinux (
with pkgs;
[
libxkbcommon
# gpu
libGL
vulkan-headers
vulkan-loader
vulkan-tools vulkan-tools-lunarg
vulkan-extension-layer
vulkan-validation-layers
# keyboard
libxkbcommon
# font loading
fontconfig
freetype
# WINIT_UNIX_BACKEND=wayland
wayland
@ -88,15 +100,15 @@
xorg.libX11
xorg.libX11.dev
]
))
++ (lib.optionals pkgs.stdenv.isDarwin (
)
++ lib.optionals pkgs.stdenv.isDarwin (
with pkgs.darwin.apple_sdk.frameworks;
[
Carbon
QuartzCore
AppKit
]
));
);
postInstall = ''
wrapProgram $out/bin/servicepoint-simulator \