diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix
new file mode 100644
index 000000000000..ac5495b98d90
--- /dev/null
+++ b/pkgs/development/tools/irony-server/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit, cmake, llvmPackages, irony }:
+
+stdenv.mkDerivation rec {
+  name = "irony-server-${version}";
+  inherit (irony) version;
+
+  buildInputs = [ cmake llvmPackages.clang ];
+
+  dontUseCmakeBuildDir = true;
+
+  cmakeDir = "server";
+
+  cmakeFlags = [
+    ''-DCMAKE_PREFIX_PATH=${llvmPackages.clang.cc}''
+  ];
+
+  src = irony.src;
+
+  meta = {
+    description = "The server part of irony.";
+    homepage = "https://melpa.org/#/irony";
+    maintainers = [ stdenv.lib.maintainers.deepfire ];
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.free;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c148094f311..9b1d4405ebc6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5094,6 +5094,14 @@ in
 
   intercal = callPackage ../development/compilers/intercal { };
 
+  irony-server = callPackage ../development/tools/irony-server/default.nix {
+    # The repository of irony to use -- must match the version of the employed emacs
+    # package.  Wishing we could merge it into one irony package, to avoid this issue,
+    # but its emacs-side expression is autogenerated, and we can't hook into it (other
+    # than peek into its version).
+    inherit (emacsPackagesNg.melpaStablePackages) irony;
+  };
+
   hugs = callPackage ../development/interpreters/hugs { };
 
   openjdk7 =