From b086c8d705e2ce4d86d4ad3fa267ef2acc3ecbb2 Mon Sep 17 00:00:00 2001 From: xenofem Date: Sat, 25 Nov 2023 23:37:56 -0500 Subject: [PATCH] temporarily backport in #269817 --- flake.lock | 8 ++++---- flake.nix | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 952d822..6ed5abd 100644 --- a/flake.lock +++ b/flake.lock @@ -2,17 +2,17 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1700897425, + "narHash": "sha256-rUd7z6weQ0zJ7mJP9N7RLMP/AWE9H/AtTV9bx7RNr6A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "491072e797f6d28960f182d45125f1f93b9522ce", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "491072e797f6d28960f182d45125f1f93b9522ce", "type": "github" } }, diff --git a/flake.nix b/flake.nix index f2eb325..eb1a110 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,8 @@ { description = "Overlay for a policy-configurable non-ESR Firefox"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/491072e797f6d28960f182d45125f1f93b9522ce"; + # inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; outputs = { self, nixpkgs }: let pkgs = import nixpkgs { system = "x86_64-linux"; }; @@ -12,10 +13,11 @@ firefox-patched-unwrapped = (pkgs.firefox-unwrapped.override { geolocationSupport = false; googleAPISupport = false; - }).overrideAttrs (oldAttrs: rec { - # Allow unsigned extensions in non-ESR firefox - MOZ_REQUIRE_SIGNING = false; + drmSupport = false; + requireSigning = false; + allowAddonSideload = true; + }).overrideAttrs (oldAttrs: rec { patches = oldAttrs.patches ++ [ # I want to preconfigure the search engine settings to make # DuckDuckGo the default search engine and remove most of the