From a4e9fb56ad4ef38b3c882a308ee9ed065e564249 Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 22 Jan 2025 14:11:58 +0100 Subject: [PATCH 1/2] rundeck: add mainProgram --- pkgs/by-name/ru/rundeck/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ru/rundeck/package.nix b/pkgs/by-name/ru/rundeck/package.nix index d1dc4e16a62e..00b6e3bdc93e 100644 --- a/pkgs/by-name/ru/rundeck/package.nix +++ b/pkgs/by-name/ru/rundeck/package.nix @@ -74,5 +74,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.asl20; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.liberodark ]; + mainProgram = "rundeck"; }; }) From 794dbd79bb30041fcc1b2f03e74880df2456694f Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 31 Jan 2025 10:17:59 +0100 Subject: [PATCH 2/2] rundeck: remove unnecessary option --- pkgs/by-name/ru/rundeck/package.nix | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pkgs/by-name/ru/rundeck/package.nix b/pkgs/by-name/ru/rundeck/package.nix index 00b6e3bdc93e..88d5d920ed08 100644 --- a/pkgs/by-name/ru/rundeck/package.nix +++ b/pkgs/by-name/ru/rundeck/package.nix @@ -30,12 +30,7 @@ stdenv.mkDerivation (finalAttrs: { cp $src $out/share/rundeck/rundeck.war mkdir -p $out/bin - # Main rundeck executable makeWrapper ${lib.getExe jdk17} $out/bin/rundeck \ - --set RDECK_BASE "/var/lib/rundeck" \ - --add-flags "-Xmx4g" \ - --add-flags "-Drdeck.base=/var/lib/rundeck" \ - --add-flags "-Drundeck.config.location=/etc/rundeck" \ --add-flags "-jar $out/share/rundeck/rundeck.war" \ --prefix PATH : ${ lib.makeBinPath [ @@ -45,19 +40,6 @@ stdenv.mkDerivation (finalAttrs: { ] } - # Installation helper script - makeWrapper ${lib.getExe jdk17} $out/bin/rundeck-install \ - --set RDECK_BASE "/var/lib/rundeck" \ - --add-flags "-jar $out/share/rundeck/rundeck.war" \ - --add-flags "--installonly" \ - --prefix PATH : ${ - lib.makeBinPath [ - which - coreutils - openssh - ] - } - runHook postInstall '';