Unverified Commit b541b4ba authored by Christoph Heiss's avatar Christoph Heiss
Browse files

floorp-bin: fix usage as `programs.firefox.package` 

Fixes #442254 [0].

Apparently, there is a big difference whether we `wrapFirefox` the
package inside top-level/all-packages.nix or by-name/.

With the latter, using something like

  programs.firefox = {
    enable = true;
    package = pkgs.floorp-bin;
  };

breaks with

  error: function 'anonymous lambda' called with unexpected arguments 'cfg', 'nativeMessagingHosts' and 'extraPrefsFiles'
  at <nixpkgs>/pkgs/by-name/fl/floorp-bin/package.nix:1:1:
      1| {
       | ^
      2|   wrapFirefox,

[0] https://github.com/NixOS/nixpkgs/issues/442254



Signed-off-by: default avatarChristoph Heiss <christoph@c8h4.io>
parent 34357f20

pkgs/by-name/fl/floorp-bin/package.nix

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
{

  wrapFirefox,

  floorp-bin-unwrapped,

}:



wrapFirefox floorp-bin-unwrapped {

  pname = "floorp-bin";

}

pkgs/top-level/all-packages.nix

+4 −0
Original line number Diff line number Diff line
@@ -11630,6 +11630,10 @@ with pkgs; 
    ];

  };



  floorp-bin = wrapFirefox floorp-bin-unwrapped {

    pname = "floorp-bin";

  };



  formiko =

    with python3Packages;

    callPackage ../applications/editors/formiko {