diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 14:07:56 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 14:24:03 +0700 |
| commit | 872973d7d1a71570dee1e9c1114e13a072bf3ffc (patch) | |
| tree | 2e9c7e63f8d6407413e21b587ae0c7d91020d71a /pkgs/servers/computing/slurm/default.nix | |
| parent | e245ae3c3ac34d24ec6ceb7b86aa74be4fb8e707 (diff) | |
| download | nixlib-872973d7d1a71570dee1e9c1114e13a072bf3ffc.tar nixlib-872973d7d1a71570dee1e9c1114e13a072bf3ffc.tar.gz nixlib-872973d7d1a71570dee1e9c1114e13a072bf3ffc.tar.bz2 nixlib-872973d7d1a71570dee1e9c1114e13a072bf3ffc.tar.lz nixlib-872973d7d1a71570dee1e9c1114e13a072bf3ffc.tar.xz nixlib-872973d7d1a71570dee1e9c1114e13a072bf3ffc.tar.zst nixlib-872973d7d1a71570dee1e9c1114e13a072bf3ffc.zip | |
pkgs/servers: stdenv.lib -> lib
Diffstat (limited to 'pkgs/servers/computing/slurm/default.nix')
| -rw-r--r-- | pkgs/servers/computing/slurm/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index d5a2c030c115..2b4c250a966c 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace src/common/env.c \ --replace "/bin/echo" "${coreutils}/bin/echo" - '' + (stdenv.lib.optionalString enableX11 '' + '' + (lib.optionalString enableX11 '' substituteInPlace src/common/x11_util.c \ --replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"' ''); @@ -50,9 +50,9 @@ stdenv.mkDerivation rec { libmysqlclient ncurses gtk2 lz4 rdma-core lua hwloc numactl readline freeipmi shadow.su pmix - ] ++ stdenv.lib.optionals enableX11 [ xorg.xauth ]; + ] ++ lib.optionals enableX11 [ xorg.xauth ]; - configureFlags = with stdenv.lib; + configureFlags = with lib; [ "--with-freeipmi=${freeipmi}" "--with-hwloc=${hwloc.dev}" "--with-lz4=${lz4.dev}" |