colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildFHSEnvBubblewrap/buildFHSEnv: permit pname+version instead of name

Browse Source
This commit is contained in:
Peder Bergebakken Sundt 2023-12-10 12:19:26 +01:00
parent bbb1f25bfb
commit eb02e003b0
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
View File

@ -8,14 +8,14 @@
, pkgsi686Linux , pkgsi686Linux
}: }:
{ name ? null { profile ? ""
, profile ? ""
, targetPkgs ? pkgs: [] , targetPkgs ? pkgs: []
, multiPkgs ? pkgs: [] , multiPkgs ? pkgs: []
, multiArch ? false # Whether to include 32bit packages , multiArch ? false # Whether to include 32bit packages
, extraBuildCommands ? "" , extraBuildCommands ? ""
, extraBuildCommandsMulti ? "" , extraBuildCommandsMulti ? ""
, extraOutputsToInstall ? [] , extraOutputsToInstall ? []
, ... # for name, or pname+version
} @ args: } @ args:
# HOWTO: # HOWTO:
@ -36,6 +36,10 @@
let let
inherit (stdenv) is64bit; inherit (stdenv) is64bit;
name = if (args ? pname && args ? version)
then "${args.pname}-${args.version}"
else args.name;
# "use of glibc_multi is only supported on x86_64-linux" # "use of glibc_multi is only supported on x86_64-linux"
isMultiBuild = multiArch && stdenv.system == "x86_64-linux"; isMultiBuild = multiArch && stdenv.system == "x86_64-linux";
isTargetBuild = !isMultiBuild; isTargetBuild = !isMultiBuild;

3
pkgs/build-support/build-fhsenv-bubblewrap/default.nix
View File

@ -47,10 +47,9 @@ let
buildFHSEnv = callPackage ./buildFHSEnv.nix { }; buildFHSEnv = callPackage ./buildFHSEnv.nix { };
fhsenv = buildFHSEnv (removeAttrs (args // { inherit name; }) [ fhsenv = buildFHSEnv (removeAttrs args [
"runScript" "extraInstallCommands" "meta" "passthru" "extraPreBwrapCmds" "extraBwrapArgs" "dieWithParent" "runScript" "extraInstallCommands" "meta" "passthru" "extraPreBwrapCmds" "extraBwrapArgs" "dieWithParent"
"unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" "privateTmp" "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" "privateTmp"
"pname" "version"
]); ]);
etcBindEntries = let etcBindEntries = let