dayon: 12.0.1 -> 13.0.0
Diff: https://github.com/RetGal/dayon/compare/v12.0.1...v13.0.0
This commit is contained in:
parent
d1a2cdd322
commit
37e6adc926
1 changed files with 6 additions and 8 deletions
|
@ -10,21 +10,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dayon";
|
||||
version = "12.0.1";
|
||||
version = "13.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RetGal";
|
||||
repo = "dayon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SCInonMTvBXtiDxWlN8QWNS+8MFB52vloonqfLcAEis=";
|
||||
hash = "sha256-2Fo+LQvsrDvqEudZxzQBtJHGxrRYUyNyhrPV1xS49pQ=";
|
||||
};
|
||||
|
||||
# https://github.com/RetGal/Dayon/pull/66
|
||||
postPatch = ''
|
||||
substituteInPlace resources/deb/dayon_assisted.desktop resources/deb/dayon_assistant.desktop \
|
||||
--replace "Exec=/usr/bin/" "Exec="
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
ant
|
||||
jdk
|
||||
|
@ -47,11 +41,15 @@ stdenv.mkDerivation rec {
|
|||
runHook preInstall
|
||||
install -Dm644 build/dayon.jar $out/share/dayon/dayon.jar
|
||||
mkdir -p $out/bin
|
||||
# jre is in PATH because dayon needs keytool to generate certificates
|
||||
makeWrapper ${jre}/bin/java $out/bin/dayon \
|
||||
--prefix PATH : "${lib.makeBinPath [ jre ]}" \
|
||||
--add-flags "-jar $out/share/dayon/dayon.jar"
|
||||
makeWrapper ${jre}/bin/java $out/bin/dayon_assisted \
|
||||
--prefix PATH : "${lib.makeBinPath [ jre ]}" \
|
||||
--add-flags "-cp $out/share/dayon/dayon.jar mpo.dayon.assisted.AssistedRunner"
|
||||
makeWrapper ${jre}/bin/java $out/bin/dayon_assistant \
|
||||
--prefix PATH : "${lib.makeBinPath [ jre ]}" \
|
||||
--add-flags "-cp $out/share/dayon/dayon.jar mpo.dayon.assistant.AssistantRunner"
|
||||
install -Dm644 resources/dayon.png $out/share/icons/hicolor/128x128/apps/dayon.png
|
||||
runHook postInstall
|
||||
|
|
Loading…
Reference in a new issue