diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-03-01 18:03:30 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-03-01 18:03:30 +0200 |
| commit | 0495b34782605f8e8836dfaf7d97ee18358cccb4 (patch) | |
| tree | fb5762c4d3e684bd7cc0112ea3395d302f0e0b94 /pkgs/os-specific/linux/trinity | |
| parent | 12ca09d14eaa837289eaba5fdf20b6c706475473 (diff) | |
| download | nixpkgs-0495b34782605f8e8836dfaf7d97ee18358cccb4.tar nixpkgs-0495b34782605f8e8836dfaf7d97ee18358cccb4.tar.gz nixpkgs-0495b34782605f8e8836dfaf7d97ee18358cccb4.tar.bz2 nixpkgs-0495b34782605f8e8836dfaf7d97ee18358cccb4.tar.lz nixpkgs-0495b34782605f8e8836dfaf7d97ee18358cccb4.tar.xz nixpkgs-0495b34782605f8e8836dfaf7d97ee18358cccb4.tar.zst nixpkgs-0495b34782605f8e8836dfaf7d97ee18358cccb4.zip | |
trinity: Apply upstream commit as a patch to fix build
Needed since glibc 2.25.
Diffstat (limited to 'pkgs/os-specific/linux/trinity')
| -rw-r--r-- | pkgs/os-specific/linux/trinity/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index a60175900cd..1a6719715d2 100644 --- 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; { |