From 985c38aa1ae8af225d5a99cd5cf7318ddbeb94fa Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 1 Jun 2024 00:04:14 +0200 Subject: [PATCH] treewide: remove buildFHSEnv `name = pname` workarounds this works since #271071 --- pkgs/applications/misc/pdfstudio/common.nix | 2 +- pkgs/development/tools/hover/default.nix | 2 +- pkgs/tools/security/beyond-identity/default.nix | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/pdfstudio/common.nix b/pkgs/applications/misc/pdfstudio/common.nix index e7d061123039..726cb6bedcc4 100644 --- a/pkgs/applications/misc/pdfstudio/common.nix +++ b/pkgs/applications/misc/pdfstudio/common.nix @@ -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 diff --git a/pkgs/development/tools/hover/default.nix b/pkgs/development/tools/hover/default.nix index dfaa976aa9e0..7e4259473801 100644 --- a/pkgs/development/tools/hover/default.nix +++ b/pkgs/development/tools/hover/default.nix @@ -85,7 +85,7 @@ let in buildFHSEnv rec { - name = pname; + inherit pname version; targetPkgs = pkgs: [ binutils dejavu_fonts diff --git a/pkgs/tools/security/beyond-identity/default.nix b/pkgs/tools/security/beyond-identity/default.nix index 31b3439f0e87..878f1f14d173 100644 --- a/pkgs/tools/security/beyond-identity/default.nix +++ b/pkgs/tools/security/beyond-identity/default.nix @@ -71,8 +71,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