diff --git a/pkgs/development/libraries/libfabric/default.nix b/pkgs/development/libraries/libfabric/default.nix
new file mode 100644
index 000000000000..4142c3763b52
--- /dev/null
+++ b/pkgs/development/libraries/libfabric/default.nix
@@ -0,0 +1,30 @@
+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, libpsm2
+, enablePsm2 ? (stdenv.isx86_64 && stdenv.isLinux) }:
+
+stdenv.mkDerivation rec {
+  pname = "libfabric";
+  version = "1.13.1";
+
+  enableParallelBuilding = true;
+
+  src = fetchFromGitHub {
+    owner = "ofiwg";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0USQMBXZrbz4GtXLNsSti9ohUOqqo0OCtVz+0Uk9ndI=";
+  };
+
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
+
+  buildInputs = lib.optional enablePsm2 libpsm2;
+
+  configureFlags = [ (if enablePsm2 then "--enable-psm2=${libpsm2}" else "--disable-psm2") ];
+
+  meta = with lib; {
+    homepage = "https://ofiwg.github.io/libfabric/";
+    description = "Open Fabric Interfaces";
+    license = with licenses; [ gpl2 bsd2 ];
+    platforms = platforms.all;
+    maintainers = [ maintainers.bzizou ];
+  };
+}
diff --git a/pkgs/os-specific/linux/libfabric/default.nix b/pkgs/os-specific/linux/libfabric/default.nix
deleted file mode 100644
index 2abe07b0964e..000000000000
--- a/pkgs/os-specific/linux/libfabric/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, libpsm2 }:
-
-stdenv.mkDerivation rec {
-  pname = "libfabric";
-  version = "1.13.0";
-
-  enableParallelBuilding = true;
-
-  src = fetchFromGitHub {
-    owner = "ofiwg";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-felGKpdihOi4TCp95T1ti7fErQVphP0vYGRKEwlQt4Q=";
-  };
-
-  nativeBuildInputs = [ pkg-config autoreconfHook ] ;
-
-  buildInputs = [ libpsm2 ] ;
-
-  configureFlags = [ "--enable-psm2=${libpsm2}" ] ;
-
-  meta = with lib; {
-    homepage = "http://libfabric.org/";
-    description = "Open Fabric Interfaces";
-    license = with licenses; [ gpl2 bsd2 ];
-    platforms = [ "x86_64-linux" ];
-    maintainers = [ maintainers.bzizou ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc3fefc6e1e8..547456d50803 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17061,7 +17061,7 @@ with pkgs;
 
   libf2c = callPackage ../development/libraries/libf2c {};
 
-  libfabric = callPackage ../os-specific/linux/libfabric {};
+  libfabric = callPackage ../development/libraries/libfabric {};
 
   libfive = libsForQt5.callPackage ../development/libraries/libfive { };