summary refs log tree commit diff
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2019-09-26 00:14:32 +0200
committerGitHub <noreply@github.com>2019-09-26 00:14:32 +0200
commit96ac71d680fe8d07e51fa979b0818b9aae06e1ec (patch)
tree1db40a75a9198f8835b1d806151a0183886b788a
parent11497a81a31eadce8ac030895e8d3c1abbfeb529 (diff)
parent7ddc19ba8cb57c5941827e0bd40d4418fb6d8d2c (diff)
downloadnixpkgs-96ac71d680fe8d07e51fa979b0818b9aae06e1ec.tar
nixpkgs-96ac71d680fe8d07e51fa979b0818b9aae06e1ec.tar.gz
nixpkgs-96ac71d680fe8d07e51fa979b0818b9aae06e1ec.tar.bz2
nixpkgs-96ac71d680fe8d07e51fa979b0818b9aae06e1ec.tar.lz
nixpkgs-96ac71d680fe8d07e51fa979b0818b9aae06e1ec.tar.xz
nixpkgs-96ac71d680fe8d07e51fa979b0818b9aae06e1ec.tar.zst
nixpkgs-96ac71d680fe8d07e51fa979b0818b9aae06e1ec.zip
Merge pull request #69431 from B4dM4n/teamspeak-client-build
teamspeak-client: fix stuck build
-rw-r--r--pkgs/applications/networking/instant-messengers/teamspeak/client.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 3c532fa506a..eaf9a8f47e5 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl
 , xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, xkeyboard_config, alsaLib
-, libpulseaudio ? null, libredirect, quazip, less, which, unzip, llvmPackages
+, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin
 }:
 
 let
@@ -26,6 +26,8 @@ let
     categories = "Network";
   };
 
+  fakeLess = writeShellScriptBin "less" "cat";
+
 in
 
 stdenv.mkDerivation rec {
@@ -46,11 +48,11 @@ stdenv.mkDerivation rec {
     sha256 = "1bywmdj54glzd0kffvr27r84n4dsd0pskkbmh59mllbxvj0qwy7f";
   };
 
-  buildInputs = [ makeWrapper less which unzip ];
+  nativeBuildInputs = [ makeWrapper fakeLess which unzip ];
 
   unpackPhase =
     ''
-      echo -e 'q\ny' | sh -xe $src
+      echo -e '\ny' | sh -xe $src
       cd TeamSpeak*
     '';