diff --git a/pkgs/by-name/pi/pixieditor/deps.json b/pkgs/by-name/pi/pixieditor/deps.json index e9fa64d94cb5..24900dfa0d0f 100644 --- a/pkgs/by-name/pi/pixieditor/deps.json +++ b/pkgs/by-name/pi/pixieditor/deps.json @@ -249,6 +249,11 @@ "version": "6.9.0", "hash": "sha256-MwPAPFD/gs9WZ8gB5BQMEwYswd3EEIpLlvMN5vmz1Wc=" }, + { + "pname": "DeviceId.Mac", + "version": "6.9.0", + "hash": "sha256-bQ59eaeDGRgk4ow7bk7U9yEnJgiV2Ok9U3fbBIOdRVw=" + }, { "pname": "DiscordRichPresence", "version": "1.3.0.28", diff --git a/pkgs/by-name/pi/pixieditor/package.nix b/pkgs/by-name/pi/pixieditor/package.nix index 7221d9d3564d..ffd013ab9fb1 100644 --- a/pkgs/by-name/pi/pixieditor/package.nix +++ b/pkgs/by-name/pi/pixieditor/package.nix @@ -23,6 +23,7 @@ makeDesktopItem, copyDesktopItems, + desktopToDarwinBundle, nix-update-script, }: @@ -70,6 +71,9 @@ buildDotnetModule (finalAttrs: { nativeBuildInputs = [ copyDesktopItems + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + desktopToDarwinBundle ]; buildInputs = [ @@ -85,15 +89,20 @@ buildDotnetModule (finalAttrs: { dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; - dotnetFlags = - lib.optionals stdenv.hostPlatform.isx86_64 [ "-p:Runtimeidentifier=linux-x64" ] - ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "-p:Runtimeidentifier=linux-arm64" ]; + dotnetFlags = [ + "-p:RuntimeIdentifier=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" + ]; buildType = "ReleaseNoUpdate"; projectFile = [ "src/PixiEditor.Desktop/PixiEditor.Desktop.csproj" "src/PixiEditor/PixiEditor.csproj" - "src/PixiEditor.Linux/PixiEditor.Linux.csproj" + ( + if stdenv.hostPlatform.isLinux then + "src/PixiEditor.Linux/PixiEditor.Linux.csproj" + else + "src/PixiEditor.MacOs/PixiEditor.MacOs.csproj" + ) "src/PixiEditor.Platform.Standalone/PixiEditor.Platform.Standalone.csproj" ]; executables = [ "PixiEditor.Desktop" ]; @@ -183,6 +192,8 @@ buildDotnetModule (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" ]; }; })