diff options
Diffstat (limited to 'nixpkgs/pkgs/servers/computing')
| -rw-r--r-- | nixpkgs/pkgs/servers/computing/slurm/default.nix | 3 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/computing/slurm/pmix-configure.patch | 13 |
2 files changed, 1 insertions, 15 deletions
diff --git a/nixpkgs/pkgs/servers/computing/slurm/default.nix b/nixpkgs/pkgs/servers/computing/slurm/default.nix index 226755b14c9e..fe8f95ecdf36 100644 --- a/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { # increase string length to allow for full # path of 'echo' in nix store ./common-env-echo.patch - # Required for configure to pick up the right dlopen path - ./pmix-configure.patch ]; prePatch = '' @@ -72,6 +70,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc/slurm" "--with-pmix=${pmix}" "--with-bpf=${libbpf}" + "--without-rpath" # Required for configure to pick up the right dlopen path ] ++ (optional enableGtk2 "--disable-gtktest") ++ (optional (!enableX11) "--disable-x11"); diff --git a/nixpkgs/pkgs/servers/computing/slurm/pmix-configure.patch b/nixpkgs/pkgs/servers/computing/slurm/pmix-configure.patch deleted file mode 100644 index 21c2197c3ff1..000000000000 --- a/nixpkgs/pkgs/servers/computing/slurm/pmix-configure.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure b/configure -index 1cf53bc..ab68441 100755 ---- a/configure -+++ b/configure -@@ -21207,7 +21207,7 @@ rm -f conftest.err conftest.i conftest.$ac_ext - as_fn_error $? "error processing $x_ac_cv_pmix_libdir: PMIx v3.x was already found in one of the previous paths" "$LINENO" 5 - fi - _x_ac_pmix_v3_found="1" -- PMIX_V3_CPPFLAGS="-I$x_ac_cv_pmix_dir/include" -+ PMIX_V3_CPPFLAGS="-I$x_ac_cv_pmix_dir/include -DPMIXP_V3_LIBPATH=\\\"$x_ac_cv_pmix_libdir\\\"" - if test "$ac_with_rpath" = "yes"; then - PMIX_V3_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir" - else |