uku/camasca
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: cleanups
All checks were successful
Build packages / Build derivations (push) Successful in 1m56s
Details

Browse source
This commit is contained in:
uku 2024-11-05 14:19:47 +01:00
parent d8ae637d5f
commit d93ace490a
Signed by: uku
SSH key fingerprint: SHA256:4P0aN6M8ajKukNi6aPOaX0LacanGYtlfjmN+m/sHY/o
3 changed files with 8 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pkgs/enigma.nix
View file

@ -22,8 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
installPhase = with finalAttrs; '' installPhase = with finalAttrs; ''
runHook preInstall runHook preInstall
mkdir -p $out/bin $out/share/${name} install -Dm644 $src $out/share/${name}.jar
cp ${src} $out/share/${name}/${name}.jar
makeWrapper ${jdk}/bin/java $out/bin/${name} --add-flags "-jar $out/share/${name}/${name}.jar" makeWrapper ${jdk}/bin/java $out/bin/${name} --add-flags "-jar $out/share/${name}/${name}.jar"
runHook postInstall runHook postInstall

21
pkgs/openwebstart.nix
View file

@ -8,7 +8,7 @@
openjdk8, openjdk8,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "OpenWebStart"; pname = "openwebstart";
version = "1.5.2"; version = "1.5.2";
src = fetchurl { src = fetchurl {
@ -18,21 +18,16 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [dpkg makeWrapper copyDesktopItems]; nativeBuildInputs = [dpkg makeWrapper copyDesktopItems];
unpackCmd = "dpkg-deb -x $src .";
sourceRoot = "opt/OpenWebStart"; sourceRoot = "opt/OpenWebStart";
unpackPhase = ''
runHook preUnpack
dpkg-deb -x $src .
runHook postUnpack
'';
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
mkdir -p $out/lib install -Dm644 openwebstart.jar -t $out/lib
cp openwebstart.jar $out/lib/
install -Dm644 App-Icon-512.png $out/share/pixmaps/openwebstart-settings.png
install -Dm644 Icon-512.png $out/share/pixmaps/openwebstart.png
makeWrapper ${openjdk8}/bin/java $out/bin/openwebstart \ makeWrapper ${openjdk8}/bin/java $out/bin/openwebstart \
--add-flags "-cp $out/lib/openwebstart.jar com.openwebstart.launcher.OpenWebStartLauncher" --add-flags "-cp $out/lib/openwebstart.jar com.openwebstart.launcher.OpenWebStartLauncher"
@ -40,10 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
makeWrapper ${openjdk8}/bin/java $out/bin/openwebstart-settings \ makeWrapper ${openjdk8}/bin/java $out/bin/openwebstart-settings \
--add-flags "-cp $out/lib/openwebstart.jar com.openwebstart.launcher.ControlPanelLauncher" --add-flags "-cp $out/lib/openwebstart.jar com.openwebstart.launcher.ControlPanelLauncher"
mkdir -p $out/share/pixmaps
cp App-Icon-512.png $out/share/pixmaps/openwebstart-settings.png
cp Icon-512.png $out/share/pixmaps/openwebstart.png
runHook postInstall runHook postInstall
''; '';

3
pkgs/vineflower.nix
View file

@ -20,8 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
installPhase = with finalAttrs; '' installPhase = with finalAttrs; ''
runHook preInstall runHook preInstall
mkdir -p $out/bin $out/share/${name} install -Dm644 $src $out/share/${name}.jar
cp ${src} $out/share/${name}/${name}.jar
makeWrapper ${jre_headless}/bin/java $out/bin/${name} --add-flags "-jar $out/share/${name}/${name}.jar" makeWrapper ${jre_headless}/bin/java $out/bin/${name} --add-flags "-jar $out/share/${name}/${name}.jar"
runHook postInstall runHook postInstall