naps2: 7.4.3 -> 7.5.3 and use non-EOL dotnet
use .NET 8 instead of the EOL version 6 added wrapGAppsHook3, this should resolve #339293 no longer broken on aarch64
This commit is contained in:
parent
71308a31a6
commit
b960901c9a
461
pkgs/by-name/na/naps2/deps.json
generated
461
pkgs/by-name/na/naps2/deps.json
generated
File diff suppressed because it is too large
Load Diff
@ -4,6 +4,7 @@
|
|||||||
buildDotnetModule,
|
buildDotnetModule,
|
||||||
dotnetCorePackages,
|
dotnetCorePackages,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
wrapGAppsHook3,
|
||||||
gtk3,
|
gtk3,
|
||||||
gdk-pixbuf,
|
gdk-pixbuf,
|
||||||
glib,
|
glib,
|
||||||
@ -13,34 +14,35 @@
|
|||||||
|
|
||||||
buildDotnetModule rec {
|
buildDotnetModule rec {
|
||||||
pname = "naps2";
|
pname = "naps2";
|
||||||
version = "7.4.3";
|
version = "7.5.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cyanfish";
|
owner = "cyanfish";
|
||||||
repo = "naps2";
|
repo = "naps2";
|
||||||
rev = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-/qSfxGHcCSoNp516LFYWgEL4csf8EKgtSffBt1C02uE=";
|
hash = "sha256-vX+ZyCQsYqJjgYaufWJRnzX8retiFK5QHSP40bbBaCc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
projectFile = "NAPS2.App.Gtk/NAPS2.App.Gtk.csproj";
|
projectFile = "NAPS2.App.Gtk/NAPS2.App.Gtk.csproj";
|
||||||
nugetDeps = ./deps.json;
|
nugetDeps = ./deps.json;
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace NAPS2.Images.Gtk/NAPS2.Images.Gtk.csproj \
|
||||||
|
--replace-fail TargetFramework TargetFrameworks \
|
||||||
|
'';
|
||||||
|
|
||||||
|
dotnetFlags = [
|
||||||
|
"-p:TargetFrameworks=net8"
|
||||||
|
"-p:EnablePreviewFeatures=true"
|
||||||
|
];
|
||||||
|
|
||||||
executables = [ "naps2" ];
|
executables = [ "naps2" ];
|
||||||
|
|
||||||
dotnet-sdk =
|
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||||
with dotnetCorePackages;
|
|
||||||
sdk_8_0
|
|
||||||
// {
|
|
||||||
inherit
|
|
||||||
(combinePackages [
|
|
||||||
sdk_8_0
|
|
||||||
sdk_6_0-bin
|
|
||||||
])
|
|
||||||
packages
|
|
||||||
targetPackages
|
|
||||||
;
|
|
||||||
};
|
|
||||||
dotnet-runtime = dotnetCorePackages.runtime_8_0;
|
dotnet-runtime = dotnetCorePackages.runtime_8_0;
|
||||||
|
|
||||||
|
nativeBuildInputs = [ wrapGAppsHook3 ];
|
||||||
|
|
||||||
selfContainedBuild = true;
|
selfContainedBuild = true;
|
||||||
runtimeDeps = [
|
runtimeDeps = [
|
||||||
gtk3
|
gtk3
|
||||||
@ -68,7 +70,6 @@ buildDotnetModule rec {
|
|||||||
maintainers = with lib.maintainers; [ eliandoran ];
|
maintainers = with lib.maintainers; [ eliandoran ];
|
||||||
platforms = lib.platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
mainProgram = "naps2";
|
mainProgram = "naps2";
|
||||||
broken = stdenv.hostPlatform.isAarch64; # Google.Protobuf.Tools dependency fails to build.
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user