gaming: use pkgs fonts instead i686 variants

Shawn8901 · Aug 4, 2023 · 7bef249 · 7bef249
1 parent bb7eb2d
commit 7bef249
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/profiles/nixos/gaming.nix b/profiles/nixos/gaming.nix
@@ -14,19 +14,15 @@ in {
         extraEnv = {
           AMD_VULKAN_ICD = config.environment.sessionVariables.AMD_VULKAN_ICD;
         };
-        extraLibraries = p:
-          with p; [
-            # Fix Unity Fonts
-            (runCommand "share-fonts" {preferLocalBuild = true;} ''
-              mkdir -p "$out/share/fonts"
-              font_regexp='.*\.\(ttf\|ttc\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?'
-              find ${toString [liberation_ttf dejavu_fonts]} -regex "$font_regexp" \
-                -exec ln -sf -t "$out/share/fonts" '{}' \;
-            '')
-
-            # https://nixpk.gs/pr-tracker.html?pr=236606
-            attr
-          ];
+        extraLibraries = p: [
+          # Fix Unity Fonts
+          (pkgs.runCommand "share-fonts" {preferLocalBuild = true;} ''
+            mkdir -p "$out/share/fonts"
+            font_regexp='.*\.\(ttf\|ttc\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?'
+            find ${toString [pkgs.liberation_ttf pkgs.dejavu_fonts]} -regex "$font_regexp" \
+              -exec ln -sf -t "$out/share/fonts" '{}' \;
+          '')
+        ];
       };
       extraCompatPackages = [fPkgs.proton-ge-custom];
     };