Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 31de7743f8a7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 12a19002cc16
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 21, 2018

  1. 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
    @mpickering @FRidh
    mpickering authored and FRidh committed Nov 21, 2018
    Copy the full SHA
    12a1900 View commit details
Showing with 4 additions and 3 deletions.
  1. +4 −3 pkgs/development/tools/kythe/default.nix
7 changes: 4 additions & 3 deletions pkgs/development/tools/kythe/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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; {