Compare commits

..

No commits in common. "e46b4ea4269b96bb452f987e61e4c49f5316c61b" and "688ffbce40ebc4f3f27df87b48c320aa31334083" have entirely different histories.

2 changed files with 11 additions and 9 deletions

View file

@ -7,7 +7,7 @@
copyDesktopItems, copyDesktopItems,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "enigma"; name = "enigma";
version = "2.5.2"; version = "2.5.2";
src = fetchurl { src = fetchurl {
@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: {
copyDesktopItems copyDesktopItems
]; ];
installPhase = '' installPhase = with finalAttrs; ''
runHook preInstall runHook preInstall
install -Dm644 $src $out/share/enigma.jar install -Dm644 $src $out/share/${name}/${name}.jar
makeWrapper ${jdk}/bin/java $out/bin/enigma --add-flags "-jar $out/share/enigma.jar" makeWrapper ${jdk}/bin/java $out/bin/${name} --add-flags "-jar $out/share/${name}/${name}.jar"
runHook postInstall runHook postInstall
''; '';

View file

@ -5,11 +5,13 @@
jre_headless, jre_headless,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "vineflower"; name = "vineflower";
version = "1.10.1"; version = "1.10.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/Vineflower/vineflower/releases/download/${finalAttrs.version}/vineflower-${finalAttrs.version}.jar"; url =
with finalAttrs;
"https://github.com/Vineflower/vineflower/releases/download/${version}/vineflower-${version}.jar";
hash = "sha256-ubII5QeTtkZXprYpIGdSZhP1Sd50BfkkNiSwL0J25Ak="; hash = "sha256-ubII5QeTtkZXprYpIGdSZhP1Sd50BfkkNiSwL0J25Ak=";
}; };
@ -17,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: {
dontUnpack = true; dontUnpack = true;
installPhase = '' installPhase = with finalAttrs; ''
runHook preInstall runHook preInstall
install -Dm644 $src $out/share/vineflower.jar install -Dm644 $src $out/share/${name}.jar
makeWrapper ${jre_headless}/bin/java $out/bin/vineflower --add-flags "-jar $out/share/vineflower.jar" makeWrapper ${jre_headless}/bin/java $out/bin/${name} --add-flags "-jar $out/share/${name}/${name}.jar"
runHook postInstall runHook postInstall
''; '';