From c3cdc27721e1ae64aca4be5e5b22e923c70c15c6 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Fri, 2 Aug 2024 11:54:30 +0800 Subject: [PATCH] wrapper-manager-fds/modules: update makeWrapper names to be more proper --- .../wrapper-manager-fds/modules/wrapper-manager/build.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/subprojects/wrapper-manager-fds/modules/wrapper-manager/build.nix b/subprojects/wrapper-manager-fds/modules/wrapper-manager/build.nix index be627eb8..e9008af9 100644 --- a/subprojects/wrapper-manager-fds/modules/wrapper-manager/build.nix +++ b/subprojects/wrapper-manager-fds/modules/wrapper-manager/build.nix @@ -53,10 +53,13 @@ build = { toplevel = let + makeWrapperArg0 = + if config.build.isBinary then "makeBinaryWrapper" else "makeShellWrapper"; + mkWrapBuild = wrappers: lib.concatMapStrings (v: '' - makeWrapper "${v.arg0}" "${builtins.placeholder "out"}/bin/${v.executableName}" ${lib.concatStringsSep " " v.makeWrapperArgs} + ${makeWrapperArg0} "${v.arg0}" "${builtins.placeholder "out"}/bin/${v.executableName}" ${lib.concatStringsSep " " v.makeWrapperArgs} '') wrappers; mkDesktopEntries = desktopEntries: builtins.map (entry: pkgs.makeDesktopItem entry) desktopEntries; @@ -69,7 +72,7 @@ name = "wrapper-manager-fds-wrapped-package"; paths = desktopEntries ++ config.basePackages; nativeBuildInputs = - if config.build.isBinary then [ pkgs.makeBinaryWrapper ] else [ pkgs.makeWrapper ]; + if config.build.isBinary then [ pkgs.makeBinaryWrapper ] else [ pkgs.makeShellWrapper ]; postBuild = '' ${config.build.extraSetup} ${mkWrapBuild (lib.attrValues config.wrappers)}