chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2026-01-12 02:09:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

devices.wlin: fix chn-bsub override usage

Browse Source
This commit is contained in:
陈浩南
2026-01-03 16:20:21 +08:00
parent f5e70e16b2
commit e2556f3a04
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
devices/wlin/default.nix
View File

@@ -9,7 +9,7 @@ let
nixpkgs = { march = "haswell"; nixRoot = "/data/gpfs01/wlin/.nix"; nixos = false; }; nixpkgs = { march = "haswell"; nixRoot = "/data/gpfs01/wlin/.nix"; nixos = false; };
}); });
python = pkgs.python3.withPackages (ps: with ps; [ phonopy ]); python = pkgs.python3.withPackages (ps: with ps; [ phonopy ]);
chn-bsub = pkgs.localPackages.chn-bsub.overrideAttrs chn-bsub = pkgs.localPackages.chn-bsub.override
(prev: { bsubConfig = builtins.toFile "bsub.yaml" (builtins.toJSON (import ./bsub.nix)); }); (prev: { bsubConfig = builtins.toFile "bsub.yaml" (builtins.toJSON (import ./bsub.nix)); });
wlin = pkgs.symlinkJoin wlin = pkgs.symlinkJoin
{ {
@@ -20,6 +20,6 @@ let
lsd lsd
]; ];
postBuild = "echo ${inputs.self.rev or "dirty"} > $out/.version"; postBuild = "echo ${inputs.self.rev or "dirty"} > $out/.version";
passthru = { inherit pkgs; archive = pkgs.closureInfo { rootPaths = [ wlin.drvPath ]; }; }; passthru = { inherit pkgs chn-bsub; archive = pkgs.closureInfo { rootPaths = [ wlin.drvPath ]; }; };
}; };
in wlin in wlin

1
packages/chn-bsub/default.nix
View File

@@ -6,4 +6,5 @@
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
postInstall = "ln -s chn-bsub $out/bin/chn_bsub"; postInstall = "ln -s chn-bsub $out/bin/chn_bsub";
cmakeFlags = lib.optional (bsubConfig != null) [ "-DBSUB_CONFIG=${bsubConfig}" ]; cmakeFlags = lib.optional (bsubConfig != null) [ "-DBSUB_CONFIG=${bsubConfig}" ];
passthru = { inherit bsubConfig; };
} }