From dbac71aff0f3aa9235061e824b861c726afe9fbd Mon Sep 17 00:00:00 2001 From: David Wolff Date: Mon, 15 Sep 2025 04:28:53 +0200 Subject: [PATCH 1/2] lldap: call runHook in buildPhase and installPhase --- pkgs/by-name/ll/lldap/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ll/lldap/package.nix b/pkgs/by-name/ll/lldap/package.nix index e14a5d130be4..2c606a7bd26d 100644 --- a/pkgs/by-name/ll/lldap/package.nix +++ b/pkgs/by-name/ll/lldap/package.nix @@ -76,15 +76,23 @@ let ]; buildPhase = '' + runHook preBuild + HOME=`pwd` ./app/build.sh + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out cp -R app/{pkg,static} $out/ cp app/index_local.html $out/index.html cp -R ${staticAssets finalAttrs.src}/* $out/static rm $out/static/libraries.txt $out/static/fonts/fonts.txt + + runHook postInstall ''; doCheck = false; From bfcaeb2071806aa044fb8d9d4c495bb1ad145d8b Mon Sep 17 00:00:00 2001 From: David Wolff Date: Mon, 15 Sep 2025 04:32:45 +0200 Subject: [PATCH 2/2] lldap: use finalAttrs when referring to frontend Referring to finalAttrs when setting the assets path in postInstall makes it easier to override the frontend without also having to override postInstall. --- pkgs/by-name/ll/lldap/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ll/lldap/package.nix b/pkgs/by-name/ll/lldap/package.nix index 2c606a7bd26d..b03c0b314574 100644 --- a/pkgs/by-name/ll/lldap/package.nix +++ b/pkgs/by-name/ll/lldap/package.nix @@ -101,6 +101,7 @@ let in rustPlatform.buildRustPackage ( + finalAttrs: commonDerivationAttrs // { cargoBuildFlags = [ @@ -115,7 +116,7 @@ rustPlatform.buildRustPackage ( nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/lldap \ - --set LLDAP_ASSETS_PATH ${frontend} + --set LLDAP_ASSETS_PATH ${finalAttrs.finalPackage.frontend} ''; passthru = { @@ -138,4 +139,5 @@ rustPlatform.buildRustPackage ( mainProgram = "lldap"; }; } + )