colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

cross: comment out the firefox hacks

Browse Source 
they're unused and broken anyway
This commit is contained in:
Colin
2023-12-07 06:38:15 +00:00
parent 8f89d11435
commit 059cd38e7b
1 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
overlays/cross.nix
View File

@@ -641,36 +641,36 @@ in with final; {
# # <https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Runtime.html> # # <https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Runtime.html>
# }; # };
firefox-extensions = prev.firefox-extensions.overrideScope' (self: super: { # firefox-extensions = prev.firefox-extensions.overrideScope' (self: super: {
unwrapped = super.unwrapped // { # unwrapped = super.unwrapped // {
browserpass-extension = super.unwrapped.browserpass-extension.override { # browserpass-extension = super.unwrapped.browserpass-extension.override {
mkYarnModules = args: needsBinfmtOrQemu { # mkYarnModules = args: needsBinfmtOrQemu {
override = { stdenv }: ( # override = { stdenv }: (
(yarn2nix-moretea.override { # (yarn2nix-moretea.override {
pkgs = pkgs.__splicedPackages // { inherit stdenv; }; # pkgs = pkgs.__splicedPackages // { inherit stdenv; };
}).mkYarnModules args # }).mkYarnModules args
).overrideAttrs (upstream: { # ).overrideAttrs (upstream: {
# i guess the VM creates the output directory for the derivation? not sure. # # i guess the VM creates the output directory for the derivation? not sure.
# and `mv` across the VM boundary breaks, too? # # and `mv` across the VM boundary breaks, too?
# original errors: # # original errors:
# - "mv: cannot create directory <$out>: File exists" # # - "mv: cannot create directory <$out>: File exists"
# - "mv: failed to preserve ownership for" # # - "mv: failed to preserve ownership for"
buildPhase = lib.replaceStrings # buildPhase = lib.replaceStrings
[ # [
"mkdir $out" # "mkdir $out"
"mv " # "mv "
] # ]
[ # [
"mkdir $out || true ; chmod +w deps/browserpass-extension-modules/package.json" # "mkdir $out || true ; chmod +w deps/browserpass-extension-modules/package.json"
"cp -Rv " # "cp -Rv "
] # ]
upstream.buildPhase # upstream.buildPhase
; # ;
}); # });
}; # };
}; # };
}; # };
}); # });
# flare-signal = prev.flare-signal.override { # flare-signal = prev.flare-signal.override {
# # fixes "cargo:warning=aarch64-unknown-linux-gnu-gcc: error: unrecognized command-line option ‘-m64’" # # fixes "cargo:warning=aarch64-unknown-linux-gnu-gcc: error: unrecognized command-line option ‘-m64’"
@@ -2314,17 +2314,17 @@ in with final; {
wob = mvToBuildInputs [ cmocka ] prev.wob; wob = mvToBuildInputs [ cmocka ] prev.wob;
wrapFirefox = prev.wrapFirefox.override { # wrapFirefox = prev.wrapFirefox.override {
buildPackages = buildPackages // { # buildPackages = buildPackages // {
# fixes "extract-binary-wrapper-cmd: line 2: strings: command not found" # # fixes "extract-binary-wrapper-cmd: line 2: strings: command not found"
# ^- in the `nix log` output of cross-compiled `firefox` (it's non-fatal) # # ^- in the `nix log` output of cross-compiled `firefox` (it's non-fatal)
makeBinaryWrapper = bpkgs.makeBinaryWrapper.overrideAttrs (upstream: { # makeBinaryWrapper = bpkgs.makeBinaryWrapper.overrideAttrs (upstream: {
passthru.extractCmd = bpkgs.writeShellScript "extract-binary-wrapper-cmd" '' # passthru.extractCmd = bpkgs.writeShellScript "extract-binary-wrapper-cmd" ''
${stdenv.cc.targetPrefix}strings -dw "$1" | sed -n '/^makeCWrapper/,/^$/ p' # ${stdenv.cc.targetPrefix}strings -dw "$1" | sed -n '/^makeCWrapper/,/^$/ p'
''; # '';
}); # });
}; # };
}; # };
wrapNeovimUnstable = neovim: config: (prev.wrapNeovimUnstable neovim config).overrideAttrs (upstream: { wrapNeovimUnstable = neovim: config: (prev.wrapNeovimUnstable neovim config).overrideAttrs (upstream: {
# nvim wrapper has a sanity check that the plugins will load correctly. # nvim wrapper has a sanity check that the plugins will load correctly.