summary refs log tree commit diff
path: root/pkgs/development/tools/kythe
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2018-11-21 15:23:29 +0000
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2018-11-21 16:23:29 +0100
commit12a19002cc16226e489c3cab9d560bec99242114 (patch)
tree363f4eaf179e0651cd39ead5be51a03babc30d73 /pkgs/development/tools/kythe
parent31de7743f8a7e31631e1dfd27b785120578c62ed (diff)
downloadnixpkgs-12a19002cc16226e489c3cab9d560bec99242114.tar
nixpkgs-12a19002cc16226e489c3cab9d560bec99242114.tar.gz
nixpkgs-12a19002cc16226e489c3cab9d560bec99242114.tar.bz2
nixpkgs-12a19002cc16226e489c3cab9d560bec99242114.tar.lz
nixpkgs-12a19002cc16226e489c3cab9d560bec99242114.tar.xz
nixpkgs-12a19002cc16226e489c3cab9d560bec99242114.tar.zst
nixpkgs-12a19002cc16226e489c3cab9d560bec99242114.zip
kythe: Add missing executable, fix rpath and symlink executables into bin (#50882)
* kythe: Add ncurses5 to rpath

* kythe: Add entrystream executable

* kythe: Symlink executables into bin/ folder
Diffstat (limited to 'pkgs/development/tools/kythe')
-rw-r--r--pkgs/development/tools/kythe/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/tools/kythe/default.nix b/pkgs/development/tools/kythe/default.nix
index 5aae1d4f3be..bd25a60f72c 100644
--- a/pkgs/development/tools/kythe/default.nix
+++ b/pkgs/development/tools/kythe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, binutils , fetchurl, glibc }:
+{ stdenv, binutils , fetchurl, glibc, ncurses5 }:
 
 stdenv.mkDerivation rec {
   version = "0.0.28";
@@ -20,13 +20,14 @@ stdenv.mkDerivation rec {
     cd tools
     for exe in http_server \
                 kythe read_entries triples verifier \
-                write_entries write_tables; do
+                write_entries write_tables entrystream; do
       echo "Patching:" $exe
       patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $exe
-      patchelf --set-rpath "${stdenv.cc.cc.lib}/lib64" $exe
+      patchelf --set-rpath "${stdenv.cc.cc.lib}/lib64:${ncurses5}/lib" $exe
     done
     cd ../
     cp -R ./ $out
+    ln -s $out/tools $out/bin
   '';
 
   meta = with stdenv.lib; {