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

Merge pull request #316271 from pbsds/fix-buildFHSEnv-pname-version-1717190193

Browse Source 
treewide: remove buildFHSEnv `name = pname` workarounds
This commit is contained in:
Peder Bergebakken Sundt 2024-06-05 03:11:22 +02:00 committed by GitHub
commit 08002bf6bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/pdfstudio/common.nix
View File

@ -70,7 +70,7 @@ let
in
# Package with cups in FHS sandbox, because JAVA bin expects "/usr/bin/lpr" for printing.
buildFHSEnv {
name = pname;
inherit pname version;
targetPkgs = pkgs: [
cups
thisPackage

2
pkgs/development/tools/hover/default.nix
View File

@ -85,7 +85,7 @@ let
in
buildFHSEnv rec {
name = pname;
inherit pname version;
targetPkgs = pkgs: [
binutils
dejavu_fonts

3
pkgs/tools/security/beyond-identity/default.nix
View File

@ -68,8 +68,7 @@ let
};
# /usr/bin/pkcheck is hardcoded in binary - we need FHS
in buildFHSEnv {
inherit meta;
name = pname;
inherit pname version meta;
targetPkgs = pkgs: [
beyond-identity