From 60ad069b435df281b96088933c7c65a26ff6a010 Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Wed, 24 Sep 2025 19:42:44 +0800
Subject: [PATCH] lib.buildNixpkgsConfig: fix wannier90 build

---
 flake/lib/buildNixpkgsConfig/default.nix | 1 +
 modules/packages/desktop.nix             | 7 +------
 packages/default.nix                     | 7 +------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix
index 221e68a6..3d0d08be 100644
--- a/flake/lib/buildNixpkgsConfig/default.nix
+++ b/flake/lib/buildNixpkgsConfig/default.nix
@@ -114,6 +114,7 @@ in platformConfig //
       {
         assimp = prev.assimp.override { stdenv = final.genericPackages.stdenv; };
         redis = prev.redis.overrideAttrs (prev: { doCheck = false; });
+        wannier90 = prev.wannier90.overrideAttrs { buildFlags = [ "dynlib" ]; };
       #   libinsane = prev.libinsane.overrideAttrs (prev:
       #     { nativeCheckInputs = builtins.filter (p: p.pname != "valgrind") prev.nativeCheckInputs; });
         lib2geom = prev.lib2geom.overrideAttrs (prev: { doCheck = false; });
diff --git a/modules/packages/desktop.nix b/modules/packages/desktop.nix
index 43c16acd..fac65148 100644
--- a/modules/packages/desktop.nix
+++ b/modules/packages/desktop.nix
@@ -59,12 +59,7 @@ inputs:
           pkgs-2311.gnuplot
           # math, physics and chemistry
           octaveFull ovito localPackages.vesta localPackages.v-sim jmol mpi geogebra6 localPackages.ufo
-          (quantum-espresso.override
-          {
-            stdenv = gcc14Stdenv;
-            gfortran = gfortran14;
-            wannier90 = wannier90.overrideAttrs { buildFlags = [ "dynlib" ]; };
-          })
+          (quantum-espresso.override { stdenv = gcc14Stdenv; gfortran = gfortran14; })
           pkgs-2311.hdfview numbat qalculate-qt
           # virtualization
           virt-viewer bottles wineWowPackages.stagingFull genymotion playonlinux
diff --git a/packages/default.nix b/packages/default.nix
index 024a8720..080038a9 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -43,11 +43,7 @@ inputs: rec
       hdf5 = inputs.pkgs.hdf5.override { mpiSupport = true; fortranSupport = true; cppSupport = false; };
     };
     nvidia = inputs.pkgs.callPackage ./vasp/nvidia
-    {
-      inherit (nvhpcPackages) stdenv hdf5 mpi;
-      src = inputs.topInputs.self.src.vasp;
-      wannier90 = inputs.pkgs.wannier90.overrideAttrs { buildFlags = [ "dynlib" ]; };
-    };
+      { inherit (nvhpcPackages) stdenv hdf5 mpi; src = inputs.topInputs.self.src.vasp; };
     intel = inputs.pkgs.callPackage ./vasp/intel
     {
       src = inputs.topInputs.self.src.vasp;
@@ -65,7 +61,6 @@ inputs: rec
         enableShared = false;
         enableStatic = true;
       };
-      wannier90 = inputs.pkgs.wannier90.overrideAttrs { buildFlags = [ "dynlib" ]; };
     };
     vtst = inputs.pkgs.callPackage ./vasp/vtst.nix { src = inputs.topInputs.self.src.vasp.vtst.script; };
   };