Skip to content

test opening file in VM #130

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

Draft
mrshmllow wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

test opening file in VM #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
};

plugin-loader-src = {
url = "github:noahc3/AffinityPluginLoader/v0.3.0";
url = "github:noahc3/AffinityPluginLoader/fix-document-path-cli-arg-handler";
flake = false;
};

Expand Down
25 changes: 4 additions & 21 deletions packages/apl/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@

projectFile = "AffinityPluginLoader.sln";

patches = [
./no-login.patch
];

nugetDeps = ./deps.json;

postInstall = ''
Expand Down Expand Up @@ -64,32 +68,11 @@
'';
};

d2d1 = pkgs.stdenv.mkDerivation rec {
src = "${inputs.plugin-loader-src}/WineFix/lib/d2d1";
pname = "d2d1";
inherit version;

nativeBuildInputs = [ pkgs.wine64 ];

TARGET = "x86_64-unix";

env.NIX_CFLAGS_COMPILE = toString [
"-Wno-error=incompatible-pointer-types"
"-Wno-error=discarded-qualifiers"
];

installPhase = ''
mkdir -p $out/lib/AffinityPluginLoader
cp build/${TARGET}/d2d1.dll.so $out/lib/AffinityPluginLoader/d2d1.dll
'';
};

apl-combined = pkgs.symlinkJoin {
pname = "apl-combined";
inherit version;
paths = [
self'.packages.apl
self'.packages.d2d1
self'.packages.bootstrap
];

Expand Down
Loading
Loading