diff options
Diffstat (limited to 'nix-conf/overlays/modifications.nix')
| -rw-r--r-- | nix-conf/overlays/modifications.nix | 58 |
1 files changed, 28 insertions, 30 deletions
diff --git a/nix-conf/overlays/modifications.nix b/nix-conf/overlays/modifications.nix index e6df8db..1312090 100644 --- a/nix-conf/overlays/modifications.nix +++ b/nix-conf/overlays/modifications.nix @@ -32,7 +32,7 @@ in ) ]; } -// prev.lib.optionalAttrs (prev.stdenv.isDarwin && prev.stdenv.isAarch64) ( +// prev.lib.optionalAttrs prev.stdenv.isDarwin ( prev.lib.optionalAttrs (v.brave != null) { brave = prev.brave.overrideAttrs ( finalAttrs: _: { @@ -44,6 +44,33 @@ in } ); } + // prev.lib.optionalAttrs (v.firefox != null) { + firefox-unwrapped = + import (prev.path + "/pkgs/applications/networking/browsers/firefox/packages/firefox.nix") + { + inherit (final) + stdenv + lib + callPackage + fetchurl + nixosTests + ; + buildMozillaMach = + args: + final.buildMozillaMach ( + args + // { + version = v.firefox.version; + packageVersion = v.firefox.version; + src = prev.fetchurl { + url = "mirror://mozilla/firefox/releases/${v.firefox.version}/source/firefox-${v.firefox.version}.source.tar.xz"; + inherit (v.firefox) sha512; + }; + } + ); + }; + firefox = final.wrapFirefox final.firefox-unwrapped { }; + } // prev.lib.optionalAttrs (v.google-chrome != null) { google-chrome = prev.google-chrome.overrideAttrs ( finalAttrs: _: { @@ -92,32 +119,3 @@ in ); } ) -// prev.lib.optionalAttrs prev.stdenv.isDarwin ( - prev.lib.optionalAttrs (v.firefox != null) { - firefox-unwrapped = - import (prev.path + "/pkgs/applications/networking/browsers/firefox/packages/firefox.nix") - { - inherit (final) - stdenv - lib - callPackage - fetchurl - nixosTests - ; - buildMozillaMach = - args: - final.buildMozillaMach ( - args - // { - version = v.firefox.version; - packageVersion = v.firefox.version; - src = prev.fetchurl { - url = "mirror://mozilla/firefox/releases/${v.firefox.version}/source/firefox-${v.firefox.version}.source.tar.xz"; - inherit (v.firefox) sha512; - }; - } - ); - }; - firefox = final.wrapFirefox final.firefox-unwrapped { }; - } -) |