trinity: 1.6 -> 1.8

NixOS · Nov 9, 2017 · d209612 · d209612
1 parent 1b1cc34
commit d209612
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix
@@ -2,29 +2,20 @@
 
 stdenv.mkDerivation rec {
   name = "trinity-${version}";
-  version = "1.6";
+  version = "1.8";
 
   src = fetchFromGitHub {
     owner = "kernelslacker";
     repo = "trinity";
     rev = "v${version}";
-    sha256 = "1jwgsjjbngn2dsnkflyigy3ajd0szksl30dlaiy02jc6mqi3nr0p";
+    sha256 = "1ss6ir3ki2hnj4c8068v5bz8bpa43xqg9zlmzhgagi94g9l05qlf";
   };
 
-  patches = stdenv.lib.singleton (fetchurl {
-    url = "https://github.com/kernelslacker/trinity/commit/b0e66a2d084ffc210bc1fc247efb4d177e9f7e3d.patch";
-    sha256 = "0468fdzbsj3n3k43qm8hf56pa020qn57ripcykv9jfwp215lf0an";
-  });
-
   postPatch = ''
-    patchShebangs ./configure.sh
+    patchShebangs ./configure
     patchShebangs ./scripts/
-    substituteInPlace Makefile --replace '/usr/bin/wc' 'wc'
-    substituteInPlace configure.sh --replace '/usr/include/linux' '${linuxHeaders}/include/linux'
   '';
 
-  configurePhase = "./configure.sh";
-
   enableParallelBuilding = true;
 
   installPhase = "make DESTDIR=$out install";