diff --git a/devices/wlin/default.nix b/devices/wlin/default.nix index eedbf49f..461ae043 100644 --- a/devices/wlin/default.nix +++ b/devices/wlin/default.nix @@ -9,7 +9,7 @@ let nixpkgs = { march = "haswell"; nixRoot = "/data/gpfs01/wlin/.nix"; nixos = false; }; }); python = pkgs.python3.withPackages (ps: with ps; [ phonopy ]); - chn-bsub = pkgs.localPackages.chn-bsub.override + chn-bsub = pkgs.pkgsStatic.localPackages.chn-bsub.override (prev: { bsubConfig = builtins.toFile "bsub.yaml" (builtins.toJSON (import ./bsub.nix)); }); wlin = pkgs.symlinkJoin { diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index fe260e67..b2657bb9 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -78,10 +78,7 @@ in platformConfig // configureFlags = prev.configureFlags or [] ++ [ "--with-lsf" ]; buildInputs = prev.buildInputs or [] ++ [ final.localPackages.lsf final.libnsl ]; }); - pkgsStatic = prev.pkgsStatic.overrideScope (final: prev: - { - cpptrace = prev.cpptrace.overrideAttrs (prev: { doCheck = false; }); - }); + cpptrace = prev.cpptrace.overrideAttrs (prev: { doCheck = !final.stdenv.hostPlatform.isStatic; }); } // ( let