diff --git a/pkgs/by-name/li/librewolf-bin/package.nix b/pkgs/by-name/li/librewolf-bin/package.nix deleted file mode 100644 index 7d3a23cd489b..000000000000 --- a/pkgs/by-name/li/librewolf-bin/package.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - appimageTools, - fetchurl, -}: - -let - pname = "librewolf-bin"; - upstreamVersion = "135.0-1"; - version = lib.replaceStrings [ "-" ] [ "." ] upstreamVersion; - src = fetchurl { - url = "https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/${upstreamVersion}/LibreWolf.x86_64.AppImage"; - hash = "sha256-Qg4hc3bpJh3NFMUlq65K1fVtp6Slgtk2OjvcELp4aH8="; - }; - appimageContents = appimageTools.extract { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; - - extraInstallCommands = '' - mv $out/bin/{${pname},librewolf} - install -Dm444 ${appimageContents}/io.gitlab.LibreWolf.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/librewolf.png -t $out/share/pixmaps - ''; - - meta = { - description = "Fork of Firefox, focused on privacy, security and freedom (upstream AppImage release)"; - homepage = "https://librewolf.net"; - license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ dwrege ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "librewolf"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9dc3848b4a9f..803ea76b6e67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13429,6 +13429,16 @@ with pkgs; libName = "librewolf"; }; + librewolf-bin = wrapFirefox librewolf-bin-unwrapped { + pname = "librewolf-bin"; + extraPrefsFiles = [ + "${librewolf-bin-unwrapped}/lib/librewolf-bin-${librewolf-bin-unwrapped.version}/librewolf.cfg" + ]; + extraPoliciesFiles = [ + "${librewolf-bin-unwrapped}/lib/librewolf-bin-${librewolf-bin-unwrapped.version}/distribution/extra-policies.json" + ]; + }; + firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { }; floorp-unwrapped = import ../applications/networking/browsers/floorp {