
This reverts commit 65a333600d5c88a98d674f637d092807cfc12253. This wasn't tested for correctness with something like fodwatch [0], and should not have been (self-)merged so quickly, especially without further review. It also resulted in the breakage of at least one package [1] (and that's the one we know of and was caught). A few packages that were updated in between this commit and this revert were not reverted back to using `rev`, but other than that, this is a 1:1 revert. [0]: https://codeberg.org/raphaelr/fodwatch [1]: https://github.com/NixOS/nixpkgs/pull/396904 / 758551e4587d75882aebc21a04bee960418f8ce9
45 lines
1.2 KiB
Nix
45 lines
1.2 KiB
Nix
{
|
|
lib,
|
|
stdenv,
|
|
fetchFromGitHub,
|
|
slurm,
|
|
}:
|
|
stdenv.mkDerivation rec {
|
|
pname = "slurm-spank-x11";
|
|
version = "0.2.5";
|
|
|
|
src = fetchFromGitHub {
|
|
owner = "hautreux";
|
|
repo = "slurm-spank-x11";
|
|
rev = version;
|
|
sha256 = "1dmsr7whxcxwnlvl1x4s3bqr5cr6q5ssb28vqi67w5hj4sshisry";
|
|
};
|
|
|
|
patches = [ ./hostlist.patch ];
|
|
|
|
# Required for build with gcc-14
|
|
env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
|
|
|
|
buildPhase = ''
|
|
gcc -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" \
|
|
-g -o slurm-spank-x11 slurm-spank-x11.c
|
|
gcc -I${lib.getDev slurm}/include -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" -shared -fPIC \
|
|
-g -o x11.so slurm-spank-x11-plug.c
|
|
'';
|
|
|
|
installPhase = ''
|
|
mkdir -p $out/bin $out/lib
|
|
install -m 755 slurm-spank-x11 $out/bin
|
|
install -m 755 x11.so $out/lib
|
|
'';
|
|
|
|
meta = with lib; {
|
|
homepage = "https://github.com/hautreux/slurm-spank-x11";
|
|
description = "Plugin for SLURM to allow for interactive X11 sessions";
|
|
mainProgram = "slurm-spank-x11";
|
|
platforms = platforms.linux;
|
|
license = licenses.gpl3Only;
|
|
maintainers = with maintainers; [ markuskowa ];
|
|
};
|
|
}
|