weasis: 4.6.2 -> 4.6.3; add support for aarch64-darwin and aarch64-linux (#435242)
This commit is contained in:
@@ -3,6 +3,7 @@
|
|||||||
stdenv,
|
stdenv,
|
||||||
fetchzip,
|
fetchzip,
|
||||||
jdk24,
|
jdk24,
|
||||||
|
unzip,
|
||||||
copyDesktopItems,
|
copyDesktopItems,
|
||||||
makeDesktopItem,
|
makeDesktopItem,
|
||||||
}:
|
}:
|
||||||
@@ -13,6 +14,9 @@ let
|
|||||||
attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||||
platform = selectSystem {
|
platform = selectSystem {
|
||||||
"x86_64-linux" = "linux-x86-64";
|
"x86_64-linux" = "linux-x86-64";
|
||||||
|
"aarch64-linux" = "linux-aarch64";
|
||||||
|
"x86_64-darwin" = "macosx-x86-64";
|
||||||
|
"aarch64-darwin" = "macosx-aarch64";
|
||||||
};
|
};
|
||||||
|
|
||||||
in
|
in
|
||||||
@@ -27,7 +31,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ copyDesktopItems ];
|
nativeBuildInputs = [
|
||||||
|
copyDesktopItems
|
||||||
|
]
|
||||||
|
++ lib.optional stdenv.isDarwin unzip;
|
||||||
|
|
||||||
desktopItems = [
|
desktopItems = [
|
||||||
(makeDesktopItem {
|
(makeDesktopItem {
|
||||||
@@ -60,12 +67,17 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
''
|
||||||
|
+ lib.optionalString stdenv.isLinux ''
|
||||||
mkdir -p $out/share/{applications,pixmaps}
|
mkdir -p $out/share/{applications,pixmaps}
|
||||||
|
|
||||||
mv weasis-${platform}-jdk${lib.versions.major jdk24.version}-${finalAttrs.version}/Weasis/* $out/
|
mv weasis-${platform}-jdk${lib.versions.major jdk24.version}-${finalAttrs.version}/Weasis/* $out/
|
||||||
mv $out/lib/*.png $out/share/pixmaps/
|
mv $out/lib/*.png $out/share/pixmaps/
|
||||||
|
''
|
||||||
|
+ lib.optionalString stdenv.isDarwin ''
|
||||||
|
mkdir -p $out/Applications
|
||||||
|
mv weasis-${platform}-jdk${lib.versions.major jdk24.version}-${finalAttrs.version}/Weasis.app $out/Applications/
|
||||||
|
''
|
||||||
|
+ ''
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
@@ -79,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
epl20
|
epl20
|
||||||
];
|
];
|
||||||
maintainers = [ ];
|
maintainers = [ ];
|
||||||
platforms = [ "x86_64-linux" ];
|
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||||
mainProgram = "Weasis";
|
mainProgram = "Weasis";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user