From e4230452beb5b1dbdc9e11d44d330f912c3fe8c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 21 Jul 2019 15:08:05 +0100 Subject: [PATCH] teamspeak_server: add missing libstdc++ Also convert to autoPatchelfHook. --- .../instant-messengers/teamspeak/server.nix | 48 +++++-------------- 1 file changed, 12 insertions(+), 36 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index fe1903af588..08561f97866 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper }: +{ stdenv, fetchurl, makeWrapper, autoPatchelfHook }: let version = "3.8.0"; @@ -19,44 +19,20 @@ stdenv.mkDerivation { else "0s835dnaw662sb2v5ahqiwry0qjcpl7ff9krnhbw2iblsbqis3fj"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; - buildPhase = - '' - echo "patching ts3server" - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ - --force-rpath \ - ts3server - cp tsdns/tsdnsserver tsdnsserver - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ - --force-rpath \ - tsdnsserver - ''; + buildInputs = [ stdenv.cc.cc ]; - installPhase = - '' - # Delete unecessary libraries - these are provided by nixos. - #rm *.so* + installPhase = '' + # Install files. + mkdir -p $out/lib/teamspeak + mv * $out/lib/teamspeak/ - # Install files. - mkdir -p $out/lib/teamspeak - mv * $out/lib/teamspeak/ - - # Make symlinks to the binaries from bin. - mkdir -p $out/bin/ - ln -s $out/lib/teamspeak/ts3server $out/bin/ts3server - ln -s $out/lib/teamspeak/tsdnsserver $out/bin/tsdnsserver - - wrapProgram $out/lib/teamspeak/ts3server --prefix LD_LIBRARY_PATH : $out/lib/teamspeak - wrapProgram $out/lib/teamspeak/tsdnsserver --prefix LD_LIBRARY_PATH : $out/lib/tsdnsserver - ''; - - dontStrip = true; - dontPatchELF = true; + # Make symlinks to the binaries from bin. + mkdir -p $out/bin/ + ln -s $out/lib/teamspeak/ts3server $out/bin/ts3server + ln -s $out/lib/teamspeak/tsdnsserver $out/bin/tsdnsserver + ''; meta = { description = "TeamSpeak voice communication server";