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

treewide: remove buildFHSEnv `name = pname` workarounds
2024-06-05 03:11:22 +02:00
parent 3370d80492 985c38aa1a
commit 08002bf6bd
3 changed files with 3 additions and 4 deletions
@@ -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
@@ -85,7 +85,7 @@ let

 in
 buildFHSEnv rec {
-  name = pname;
+  inherit pname version;
  targetPkgs = pkgs: [
    binutils
    dejavu_fonts
@@ -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