nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 21:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #258382 from NixOS/backport-257122-to-release-23.05

Browse Source 
[Backport release-23.05] buildFHSEnvBubblewrap: allow being passed 'pname'
This commit is contained in:
Weijia Wang
2023-10-01 15:46:00 +02:00
committed by GitHub
parent 96c84127d7 dd0b941381
commit ee4ba98b3c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ assert (pname != null || version != null) -> (name == null && pname != null); #
with builtins;
let
pname = if args.name != null then args.name else args.pname;
pname = if args ? name && args.name != null then args.name else args.pname;
versionStr = lib.optionalString (version != null) ("-" + version);
name = pname + versionStr;