Change the firefox workaround used

This commit is contained in:
Charlotte 🦝 Delenk 2022-04-10 09:01:54 +01:00
parent b9074b8b00
commit 671daa3a1e
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
4 changed files with 3 additions and 22 deletions

View file

@ -45,7 +45,6 @@
"dom.enable_performance" = false; # Disable DOM timing API
"dom.enable_resource_timing" = false; # Disable resource timing API
"dom.enable_user_timing" = false; # Disable user timing API
"dom.webaudio.enabled" = false; # Disable Web Audio API
"geo.enabled" = false; # Disable Geolocation
"geo.wifi.uri" = "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"; # Use Mozilla geolocation service
"geo.wifi.logging.enabled" = false; # Disable logging for wifi geolocation
@ -288,6 +287,8 @@
"security.ssl3.rsa_aes_128_sha" = false;
"security.ssl3.ecdhe_rsa_aes_256_sha" = false;
"security.ssl3.ecdhe_ecdsa_aes_256_sha" = false;
"security.sandbox.content.level" = 3; # Workaround for glibc regression, remove when #167785 hits
};
id = 0;
};

View file

@ -1,6 +1,5 @@
{ system, pkgs, nixpkgs, hydra, nixpkgs-firefox, ... }: with pkgs;
{ system, pkgs, nixpkgs, hydra, ... }: with pkgs;
let
n-firefox = import nixpkgs-firefox { inherit system; };
hydra-pkg = hydra.defaultPackage.${system};
rtf-tokenize = with python3Packages; buildPythonPackage rec {
pname = "rtf_tokenize";
@ -63,7 +62,6 @@ in
{
nixpkgs.overlays = [
(self: prev: {
firefox = n-firefox.firefox;
hydra-unstable = hydra-pkg.overrideAttrs (old: {
postPatch = ''
sed -i 's/totalNarSize > maxOutputSize/false/g' src/hydra-queue-runner/build-remote.cc

View file

@ -437,22 +437,6 @@
"type": "github"
}
},
"nixpkgs-firefox": {
"locked": {
"lastModified": 1649537291,
"narHash": "sha256-V6VYIwTeI5BCfYK9f5EsMbjsjsis1rUDHMsaDbTvt+A=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "715dc137b08213aabbbe0965b78ab938e5d8d3b7",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-21.11-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-hydra": {
"locked": {
"lastModified": 1645296114,
@ -658,7 +642,6 @@
"miifox-net": "miifox-net",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_6",
"nixpkgs-firefox": "nixpkgs-firefox",
"nixpkgs-hydra": "nixpkgs-hydra",
"nur": "nur",
"polymc": "polymc",

View file

@ -25,7 +25,6 @@ rec {
nixos-hardware.url = github:NixOS/nixos-hardware;
miifox-net.url = "git+https://git.chir.rs/CarolineHusky/MiiFox.net";
miifox-net.flake = false;
nixpkgs-firefox.url = github:NixOS/nixpkgs/nixos-21.11-small;
};
outputs = { self, nixpkgs, sops-nix, home-manager, chir-rs, nur, polymc, ... } @ args: