Compare commits
2
Commits
e220f022fa
...
ebd79d5ca5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ebd79d5ca5 | ||
|
|
b857f5d038 |
No files matched your search
Generated
+21
-21
@@ -46,11 +46,11 @@
|
|||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1788856318,
|
"lastModified": 1791368707,
|
||||||
"narHash": "sha256-bOLED82KPrzIXTWELw30y3PVI6MBmlY4Y2F2lwrdOnM=",
|
"narHash": "sha256-HmIA3HZYBSBhzUF7TZ0HDx0+DyVg4iNWJhqRoG8xZjQ=",
|
||||||
"owner": "mulatta",
|
"owner": "mulatta",
|
||||||
"repo": "buzz.nix",
|
"repo": "buzz.nix",
|
||||||
"rev": "fdd0152c12c6be339fe01d91887122bb10823aaf",
|
"rev": "3feda8d4f2435d430e46b204d88569d99e821839",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -61,11 +61,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1789006805,
|
"lastModified": 1791594108,
|
||||||
"narHash": "sha256-xB8mKMOx1IA9vTDNLmJZ6n4wCMq/cuWBBOzGCRnqxrU=",
|
"narHash": "sha256-XK4KceonkwD8LuMAt/vNrz982mXJM5jeHAxMwsUXXAQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8ce4ef6cb6f871616146b9fe26d2a5ae594e94fe",
|
"rev": "6510408d147d8c5e6d76043e899e9251756f6a75",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -77,11 +77,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-master": {
|
"nixpkgs-master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1789139724,
|
"lastModified": 1791717656,
|
||||||
"narHash": "sha256-QEoQ8xoSO3H2tmwHNBYFL/5Y8Gt10U+bg5ETMsWXiIM=",
|
"narHash": "sha256-NHZsKA3fUek3FlFk9yIAdM/+C3JlUxqHHFini7BevD0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e27e37949736566430ed2f6157bebcdade8860c5",
|
"rev": "f38d30d14a7442201671d50c86a2ec719978168e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -93,11 +93,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776683584,
|
"lastModified": 1790510107,
|
||||||
"narHash": "sha256-NuTLMrr10Tng72hurYG8jYQ4XKK8wnpJmOGcPiis96g=",
|
"narHash": "sha256-EVMNYv7hYDDD9TGVT/hIyTYgpiXA8y3m5xIEIxuGNU0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9dd5558b06dbdacbf635a3dd36dce1b1a7ee3a89",
|
"rev": "3181085bfd08663b6b9e60bc7a8395c2aaa741bd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -112,11 +112,11 @@
|
|||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1789132601,
|
"lastModified": 1791710828,
|
||||||
"narHash": "sha256-2+j5RuHoqrsnjssZ4VfIfSKzGdrPNFT4nazJ2QxNdu0=",
|
"narHash": "sha256-Kk5uJmhse0sKaAWg2fUC7GiAJDPIdzm9xyBLjvh5EUc=",
|
||||||
"owner": "anomalyco",
|
"owner": "anomalyco",
|
||||||
"repo": "opencode",
|
"repo": "opencode",
|
||||||
"rev": "95daf90670b7c039c436c85537da5fbfe2205b41",
|
"rev": "d21b0790a6c146815f28fea604e41e922f009590",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -144,11 +144,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1788591095,
|
"lastModified": 1791013993,
|
||||||
"narHash": "sha256-Vh+BeLWfbTT9AecazIsQ/Tkg/RzJeX3lEduANf256WA=",
|
"narHash": "sha256-BiFPwFsbFnZH5GfWbQFKYuQNg+67aNQCoRSRNTeJFQc=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "c361047d3a538f547f1617bb6b410411929ac9cc",
|
"rev": "7470661ba2b51156048af08464b82020223dc942",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -165,11 +165,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1786901030,
|
"lastModified": 1790542030,
|
||||||
"narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=",
|
"narHash": "sha256-U6m0B5+ALyOLYG4OVvtguLdem7iYgN6cIP5Q1RhM+g8=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa",
|
"rev": "6aca3b3649eb1edf472eca3e91e6bcc0c84a6ad3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ Custom package registry using `callPackage` pattern for flake-wide availability.
|
|||||||
- `launch-webapp/`: Webapp wrapper
|
- `launch-webapp/`: Webapp wrapper
|
||||||
- `mem0/`: Python package + custom `server.py`
|
- `mem0/`: Python package + custom `server.py`
|
||||||
- `msty-studio/`: AppImage wrapper
|
- `msty-studio/`: AppImage wrapper
|
||||||
|
- `photocraft/`: Rust package (Photoshop reimplementation, built from source)
|
||||||
- `pomodoro-timer/`: Timer utility
|
- `pomodoro-timer/`: Timer utility
|
||||||
- `tuxedo-backlight/`: Hardware control
|
- `tuxedo-backlight/`: Hardware control
|
||||||
- `zellij-ps/`: Gitea-hosted package
|
- `zellij-ps/`: Gitea-hosted package
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ in {
|
|||||||
launch-webapp = pkgs.callPackage ./launch-webapp {};
|
launch-webapp = pkgs.callPackage ./launch-webapp {};
|
||||||
mem0 = pkgs.callPackage ./mem0 {};
|
mem0 = pkgs.callPackage ./mem0 {};
|
||||||
msty-studio = pkgs.callPackage ./msty-studio {};
|
msty-studio = pkgs.callPackage ./msty-studio {};
|
||||||
|
photocraft = pkgs.callPackage ./photocraft {};
|
||||||
pomodoro-timer = pkgs.callPackage ./pomodoro-timer {};
|
pomodoro-timer = pkgs.callPackage ./pomodoro-timer {};
|
||||||
rofi-project-opener = pkgs.callPackage ./rofi-project-opener {};
|
rofi-project-opener = pkgs.callPackage ./rofi-project-opener {};
|
||||||
stt-ptt = pkgs.callPackage ./stt-ptt {};
|
stt-ptt = pkgs.callPackage ./stt-ptt {};
|
||||||
|
|||||||
@@ -0,0 +1,110 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
rustPlatform,
|
||||||
|
fetchFromGitHub,
|
||||||
|
makeWrapper,
|
||||||
|
nix-update-script,
|
||||||
|
# Not linked at build time — dlopen'd by the app at runtime (see postFixup).
|
||||||
|
dbus,
|
||||||
|
libglvnd,
|
||||||
|
libx11,
|
||||||
|
libxcursor,
|
||||||
|
libxi,
|
||||||
|
libxrandr,
|
||||||
|
libxkbcommon,
|
||||||
|
vulkan-loader,
|
||||||
|
wayland,
|
||||||
|
}: let
|
||||||
|
# PhotoCraft reaches the windowing/graphics stack exclusively through
|
||||||
|
# dlopen (wayland-sys, x11-dl, ash → libvulkan, glutin → libEGL/libGL):
|
||||||
|
# Cargo.lock contains no native *-sys crate, so the build needs zero
|
||||||
|
# buildInputs and these libraries are provided via LD_LIBRARY_PATH instead
|
||||||
|
# (same pattern as neovide). dbus.lib is dlopen'd by rfd's xdg-desktop-portal
|
||||||
|
# backend — without it, file dialogs fall back to zenity.
|
||||||
|
runtimeLibs = [
|
||||||
|
dbus.lib
|
||||||
|
libglvnd
|
||||||
|
libx11
|
||||||
|
libxcursor
|
||||||
|
libxi
|
||||||
|
libxrandr
|
||||||
|
libxkbcommon
|
||||||
|
vulkan-loader
|
||||||
|
wayland
|
||||||
|
];
|
||||||
|
in
|
||||||
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
|
pname = "photocraft";
|
||||||
|
version = "0.7.0";
|
||||||
|
|
||||||
|
# AppStream <releases> date of the GitHub release — bump together with `version`.
|
||||||
|
releaseDate = "2026-10-11";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "storytold";
|
||||||
|
repo = "photocraft";
|
||||||
|
tag = "v${finalAttrs.version}";
|
||||||
|
hash = "sha256-XyRDSkGAw1W9kF61nujHkgIR7TkTjrQbbcu+tSxWjXU=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoHash = "sha256-kpNg04RP5XbtW2rMaXUmGIKRJIqJmi7fmTbs5qHTLto=";
|
||||||
|
|
||||||
|
# Match the official release builds (CI builds with `--features heif`):
|
||||||
|
# HEIC/HEIF reading via pure-Rust heic-rs — no native C dependency.
|
||||||
|
# Scoped per binary so the CLI ships the same codec set as the app.
|
||||||
|
buildFeatures = [
|
||||||
|
"photocraft/heif"
|
||||||
|
"photocraft-cli/heif"
|
||||||
|
];
|
||||||
|
|
||||||
|
# The workspace default also builds xtask; ship only the two user-facing
|
||||||
|
# binaries (desktop app + headless CLI with batch and MCP support).
|
||||||
|
cargoBuildFlags = [
|
||||||
|
"-p"
|
||||||
|
"photocraft"
|
||||||
|
"-p"
|
||||||
|
"photocraft-cli"
|
||||||
|
];
|
||||||
|
|
||||||
|
# ~260 test binaries, and the corpus tests additionally fetch external
|
||||||
|
# files (cargo xtask corpus). Skip the suite in the package build.
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
nativeBuildInputs = [makeWrapper];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
install -Dm644 packaging/linux/ai.storyteller.photocraft.desktop \
|
||||||
|
-t $out/share/applications
|
||||||
|
|
||||||
|
mkdir -p $out/share/metainfo
|
||||||
|
substitute packaging/linux/ai.storyteller.photocraft.metainfo.xml.in \
|
||||||
|
$out/share/metainfo/ai.storyteller.photocraft.metainfo.xml \
|
||||||
|
--replace-fail @VERSION@ ${finalAttrs.version} \
|
||||||
|
--replace-fail @DATE@ ${finalAttrs.releaseDate}
|
||||||
|
|
||||||
|
install -Dm644 packaging/linux/ai.storyteller.photocraft.mime.xml \
|
||||||
|
$out/share/mime/packages/ai.storyteller.photocraft.xml
|
||||||
|
|
||||||
|
mkdir -p $out/share/icons
|
||||||
|
cp -R assets/app-icon/hicolor $out/share/icons
|
||||||
|
chmod -R u+w $out/share/icons
|
||||||
|
'';
|
||||||
|
|
||||||
|
postFixup = ''
|
||||||
|
wrapProgram $out/bin/photocraft \
|
||||||
|
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath runtimeLibs}
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Update with: nix run github:NixOS/nixpkgs#nix-update -- --flake <repo-root> photocraft
|
||||||
|
# (bumps version, src hash and cargoHash in one run)
|
||||||
|
passthru.updateScript = nix-update-script {};
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Open-source, clean-room reimplementation of Adobe Photoshop in pure Rust";
|
||||||
|
homepage = "https://getartcraft.com/apps/photocraft";
|
||||||
|
changelog = "https://github.com/storytold/photocraft/releases/tag/v${finalAttrs.version}";
|
||||||
|
license = with lib.licenses; [asl20 mit];
|
||||||
|
mainProgram = "photocraft";
|
||||||
|
platforms = lib.platforms.linux;
|
||||||
|
};
|
||||||
|
})
|
||||||
Reference in new issue
Block a user