trinity: Apply upstream commit as a patch to fix build

Needed since glibc 2.25.
NixOS · Mar 1, 2017 · 0495b34 · 0495b34
1 parent 12ca09d
commit 0495b34
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, linuxHeaders }:
+{ stdenv, fetchurl, fetchFromGitHub, linuxHeaders }:
 
 stdenv.mkDerivation rec {
   name = "trinity-${version}";
@@ -11,7 +11,12 @@ stdenv.mkDerivation rec {
     sha256 = "1jwgsjjbngn2dsnkflyigy3ajd0szksl30dlaiy02jc6mqi3nr0p";
   };
 
-  patchPhase = ''
+  patches = stdenv.lib.singleton (fetchurl {
+    url = "https://github.com/kernelslacker/trinity/commit/b0e66a2d084ffc210bc1fc247efb4d177e9f7e3d.patch";
+    sha256 = "0468fdzbsj3n3k43qm8hf56pa020qn57ripcykv9jfwp215lf0an";
+  });
+
+  postPatch = ''
     patchShebangs ./configure.sh
     patchShebangs ./scripts/
     substituteInPlace Makefile --replace '/usr/bin/wc' 'wc'
@@ -20,6 +25,8 @@ stdenv.mkDerivation rec {
 
   configurePhase = "./configure.sh";
 
+  enableParallelBuilding = true;
+
   installPhase = "make DESTDIR=$out install";
 
   meta = with stdenv.lib; {