From f47364182600f9c3d4a551b7e4990ba4c1e71345 Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Fri, 15 Nov 2024 16:23:04 -0500 Subject: [PATCH] finally got mozilla.cfg working firefox nix, broke webgl --- home/nix/programs/firefox.nix | 2 +- home/nix/programs/nixGL.nix | 30 ------------------------------ 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 home/nix/programs/nixGL.nix diff --git a/home/nix/programs/firefox.nix b/home/nix/programs/firefox.nix index 5e89ef3..6ae8b74 100644 --- a/home/nix/programs/firefox.nix +++ b/home/nix/programs/firefox.nix @@ -1,4 +1,4 @@ -{ pkgs, nixgl, ... }: +{ pkgs ... }: let lock-false = { Value = false; diff --git a/home/nix/programs/nixGL.nix b/home/nix/programs/nixGL.nix deleted file mode 100644 index 81c44cb..0000000 --- a/home/nix/programs/nixGL.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ pkgs, nixgl, ... }: - -let - nixGL = "${nixgl.packages.${pkgs.system}.nixGLIntel}/bin/nixGLIntel"; -in - pkg: - (pkg.overrideAttrs (old: { - buildCommand = '' - set -eo pipefail - - ${ - # Heavily inspired by https://stackoverflow.com/a/68523368/6259505 - pkgs.lib.concatStringsSep "\n" (map (outputName: '' - echo "Copying output ${outputName}" - set -x - cp -rs --no-preserve=mode "${pkg.${outputName}}" "''$${outputName}" - set +x - '') (old.outputs or [ "out" ]))} - - rm -rf $out/bin/* - shopt -s nullglob # Prevent loop from running if no files - for file in ${pkg.out}/bin/*; do - echo "#!${pkgs.bash}/bin/bash" > "$out/bin/$(basename $file)" - echo "exec -a \"\$0\" ${nixGL} $file \"\$@\"" >> "$out/bin/$(basename $file)" - chmod +x "$out/bin/$(basename $file)" - done - shopt -u nullglob # Revert nullglob back to its normal default state - ''; - })) -