diff options
Diffstat (limited to 'pkgs/build-support/build-fhsenv-bubblewrap/default.nix')
| -rw-r--r-- | pkgs/build-support/build-fhsenv-bubblewrap/default.nix | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index c30a4dfb7ea37..12f3e7d585521 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -9,10 +9,7 @@ , bubblewrap }: -{ name ? null -, pname ? null -, version ? null -, runScript ? "bash" +{ runScript ? "bash" , extraInstallCommands ? "" , meta ? {} , passthru ? {} @@ -29,7 +26,7 @@ , ... } @ args: -assert (pname != null || version != null) -> (name == null && pname != null); # You must declare either a name or pname + version (preferred). +assert (!args ? pname || !args ? version) -> (args ? name); # You must provide name if pname or version (preferred) is missing. let inherit (lib) @@ -43,16 +40,16 @@ let inherit (lib.attrsets) removeAttrs; - pname = if args ? name && args.name != null then args.name else args.pname; - versionStr = optionalString (version != null) ("-" + version); - name = pname + versionStr; + name = args.name or "${args.pname}-${args.version}"; + executableName = args.pname or args.name; + # we don't know which have been supplied, and want to avoid defaulting missing attrs to null. Passed into runCommandLocal + nameAttrs = lib.filterAttrs (key: value: builtins.elem key [ "name" "pname" "version" ]) args; buildFHSEnv = callPackage ./buildFHSEnv.nix { }; - fhsenv = buildFHSEnv (removeAttrs (args // { inherit name; }) [ + fhsenv = buildFHSEnv (removeAttrs args [ "runScript" "extraInstallCommands" "meta" "passthru" "extraPreBwrapCmds" "extraBwrapArgs" "dieWithParent" "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" "privateTmp" - "pname" "version" ]); etcBindEntries = let @@ -270,8 +267,7 @@ let ''; bin = writeShellScript "${name}-bwrap" (bwrapCmd { initArgs = ''"$@"''; }); -in runCommandLocal name { - inherit pname version; +in runCommandLocal name (nameAttrs // { inherit meta; passthru = passthru // { @@ -285,9 +281,9 @@ in runCommandLocal name { ''; inherit args fhsenv; }; -} '' +}) '' mkdir -p $out/bin - ln -s ${bin} $out/bin/${pname} + ln -s ${bin} $out/bin/${executableName} ${extraInstallCommands} '' |