summary refs log tree commit diff
path: root/pkgs/os-specific/linux/trinity
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2017-11-08 16:19:38 +0200
committerTuomas Tynkkynen <tuomas@tuxera.com>2017-11-09 10:53:33 +0200
commitd20961249656cbe4a296dc3c03868e451cbd65cc (patch)
treee5e731cd7f58b3a4ccaa33e8496b0a5037695fbd /pkgs/os-specific/linux/trinity
parent1b1cc34020a09c740bf8263daa9cc07d8ae52424 (diff)
downloadnixlib-d20961249656cbe4a296dc3c03868e451cbd65cc.tar
nixlib-d20961249656cbe4a296dc3c03868e451cbd65cc.tar.gz
nixlib-d20961249656cbe4a296dc3c03868e451cbd65cc.tar.bz2
nixlib-d20961249656cbe4a296dc3c03868e451cbd65cc.tar.lz
nixlib-d20961249656cbe4a296dc3c03868e451cbd65cc.tar.xz
nixlib-d20961249656cbe4a296dc3c03868e451cbd65cc.tar.zst
nixlib-d20961249656cbe4a296dc3c03868e451cbd65cc.zip
trinity: 1.6 -> 1.8
Diffstat (limited to 'pkgs/os-specific/linux/trinity')
-rw-r--r--pkgs/os-specific/linux/trinity/default.nix15
1 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix
index 1a6719715d2b..48f6ce4be765 100644
--- 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";