mathematica: fix properly

LEXUGE · Dec 1, 2023 · eee28f1 · eee28f1
1 parent 4b6cf09
commit eee28f1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/cfgs/x1c7/default.nix b/cfgs/x1c7/default.nix
@@ -78,17 +78,7 @@
           steam
           obsidian
           # We fix installer version so don't get updated automatically when Wolfram releases new version
-          # Fix the libdbus error
-          (pkgs.buildFHSUserEnv {
-            name = "mathematica";
-
-            targetPkgs = pkgs: ([
-              mathematica_13_3_1'
-              dbus.lib
-            ]);
-
-            runScript = "mathematica";
-          })
+          mathematica_13_3_1
         ];
         extraDconf = {
           "org/gnome/desktop/interface"."scaling-factor" = hm.gvariant.mkUint32 2;

diff --git a/flake.nix b/flake.nix
@@ -77,6 +77,15 @@
   rec {
     # Use the default overlay to export all packages under ./pkgs
     overlays = {
+      # Patch mathematica to solve "libdbus not found" error.
+      mathematica = (final: prev: {
+        mathematica_13_3_1 = (prev.mathematica.overrideAttrs (_: prevAttrs: {
+          wrapProgramFlags = prevAttrs.wrapProgramFlags ++ [ "--prefix LD_LIBRARY_PATH : ${prev.lib.makeLibraryPath [ prev.dbus.lib ]}" ];
+        })).override {
+          version = "13.3.1";
+        };
+      });
+
       default = final: prev:
         (import ./pkgs {
           inherit (prev) lib;
@@ -108,11 +117,7 @@
       extraOverlays = [
         dcompass.overlays.default
         ash-emacs.overlays.default
-        (final: prev: {
-          mathematica_13_3_1' = prev.mathematica.override {
-            version = "13.3.1";
-          };
-        })
+        self.overlays.mathematica
       ];
       system = system.x86_64-linux;
     };