From 46ba5acd822e813418483e7975357c7b5e8586c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 6 Mar 2017 21:34:12 +0100
Subject: [PATCH] dmtcp: 2.3.1 -> 2.5.0

---
 pkgs/os-specific/linux/dmtcp/default.nix | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix
index fea41affe2c4..e67e54f7b439 100644
--- a/pkgs/os-specific/linux/dmtcp/default.nix
+++ b/pkgs/os-specific/linux/dmtcp/default.nix
@@ -1,18 +1,24 @@
-{stdenv, fetchurl, perl, python}:
-# Perl and Python required by the test suite.
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "dmtcp-${version}";
+  version = "2.5.0";
 
-  version = "2.3.1";
-
-  buildInputs = [ perl python ];
-
-  src = fetchurl {
-    url = "mirror://sourceforge/dmtcp/dmtcp-${version}.tar.gz";
-    sha256 = "1f83ae112e102d4fbf69dded0dfaa6daeb60c4c0c569297553785a876e95ba15";
+  src = fetchFromGitHub {
+    owner = "dmtcp";
+    repo = "dmtcp";
+    rev = version;
+    sha256 = "08l774i8yp41j6kmzhj7x13475m5kdfhn678ydpm5cbg4l3dda3c";
   };
 
+  dontDisableStatic = true;
+
+  postPatch = ''
+    substituteInPlace configure \
+      --replace '#define ELF_INTERPRETER "$interp"' \
+                "#define ELF_INTERPRETER \"$(cat $NIX_CC/nix-support/dynamic-linker)\""
+  '';
+
   preConfigure = ''
     substituteInPlace src/dmtcp_coordinator.cpp \
       --replace /bin/bash ${stdenv.shell}