From 6fe6c35a9660a18cdf93b99f141a5b9a0eb06be5 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 20 Mar 2021 10:40:52 -0400 Subject: [PATCH] kodi.packages.buildKodiAddon, kodi.packages.buildKodiBinaryAddon: include runHook preInstall and postInstall --- pkgs/applications/video/kodi/build-kodi-addon.nix | 4 ++++ pkgs/applications/video/kodi/build-kodi-binary-addon.nix | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/pkgs/applications/video/kodi/build-kodi-addon.nix b/pkgs/applications/video/kodi/build-kodi-addon.nix index cd768b6fa991..572d5dda8053 100644 --- a/pkgs/applications/video/kodi/build-kodi-addon.nix +++ b/pkgs/applications/video/kodi/build-kodi-addon.nix @@ -11,11 +11,15 @@ toKodiAddon (stdenv.mkDerivation ({ extraRuntimeDependencies = [ ]; installPhase = '' + runHook preInstall + cd $src/$sourceDir d=$out${addonDir}/${namespace} mkdir -p $d sauce="." [ -d ${namespace} ] && sauce=${namespace} cp -R "$sauce/"* $d + + runHook postInstall ''; } // attrs)) diff --git a/pkgs/applications/video/kodi/build-kodi-binary-addon.nix b/pkgs/applications/video/kodi/build-kodi-binary-addon.nix index 74ce508ab6a6..e0ca5d1cf6eb 100644 --- a/pkgs/applications/video/kodi/build-kodi-binary-addon.nix +++ b/pkgs/applications/video/kodi/build-kodi-binary-addon.nix @@ -24,8 +24,12 @@ toKodiAddon (stdenv.mkDerivation ({ # and the non-wrapped kodi lib/... folder before even trying to dlopen # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use installPhase = let n = namespace; in '' + runHook preInstall + make install ln -s $out/lib/addons/${n}/${n}.so.${version} $out${addonDir}/${n}/${n}.so.${version} ${extraInstallPhase} + + runHook postInstall ''; } // attrs))