summary refs log tree commit diff
diff options
context:
space:
mode:
authorArseniy Seroka <jagajaga@users.noreply.github.com>2015-11-09 22:47:01 +0300
committerArseniy Seroka <jagajaga@users.noreply.github.com>2015-11-09 22:47:01 +0300
commitf60d710f88ec83f61b36c1dc565477b3105e6a4f (patch)
tree0009678249374f708936a409f3986061649f8140
parentbb7562a14d475da4be9222e204ab36935f50f525 (diff)
parent291f18733402883b322121f6acb31f4f75506f51 (diff)
downloadnixpkgs-f60d710f88ec83f61b36c1dc565477b3105e6a4f.tar
nixpkgs-f60d710f88ec83f61b36c1dc565477b3105e6a4f.tar.gz
nixpkgs-f60d710f88ec83f61b36c1dc565477b3105e6a4f.tar.bz2
nixpkgs-f60d710f88ec83f61b36c1dc565477b3105e6a4f.tar.lz
nixpkgs-f60d710f88ec83f61b36c1dc565477b3105e6a4f.tar.xz
nixpkgs-f60d710f88ec83f61b36c1dc565477b3105e6a4f.tar.zst
nixpkgs-f60d710f88ec83f61b36c1dc565477b3105e6a4f.zip
Merge pull request #10894 from dezgeg/pr-trinity-update
trinity: 1.5 -> 1.6
-rw-r--r--pkgs/os-specific/linux/trinity/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix
index 9b7e2a6876a..a60175900cd 100644
--- a/pkgs/os-specific/linux/trinity/default.nix
+++ b/pkgs/os-specific/linux/trinity/default.nix
@@ -1,20 +1,21 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, linuxHeaders }:
 
 stdenv.mkDerivation rec {
   name = "trinity-${version}";
-  version = "1.5";
+  version = "1.6";
 
   src = fetchFromGitHub {
     owner = "kernelslacker";
     repo = "trinity";
     rev = "v${version}";
-    sha256 = "0diwkda6n7yw8plfanivncwangk2kv1acxv0kyk3ly5jhlajwc0s";
+    sha256 = "1jwgsjjbngn2dsnkflyigy3ajd0szksl30dlaiy02jc6mqi3nr0p";
   };
 
   patchPhase = ''
     patchShebangs ./configure.sh
     patchShebangs ./scripts/
     substituteInPlace Makefile --replace '/usr/bin/wc' 'wc'
+    substituteInPlace configure.sh --replace '/usr/include/linux' '${linuxHeaders}/include/linux'
   '';
 
   configurePhase = "./configure.sh";