git.iko.soy/typeable/nixpkgs
on master help sign in
teamspeak-client: fix stuck build
7ddc19bFabian Möller
pkgs/applications/networking/instant-messengers/teamspeak/client.nix+5−3
@@ -1,6 +1,6 @@
1{ stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl
1{ stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl
2, xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, xkeyboard_config, alsaLib
2, xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, xkeyboard_config, alsaLib
3−, libpulseaudio ? null, libredirect, quazip, less, which, unzip, llvmPackages
3+, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin
4}:
4}:
5
5
6let
6let
@@ -26,6 +26,8 @@ let
26 categories = "Network";
26 categories = "Network";
27 };
27 };
28
28
29+ fakeLess = writeShellScriptBin "less" "cat";
30+
29in
31in
30
32
31stdenv.mkDerivation rec {
33stdenv.mkDerivation rec {
@@ -46,11 +48,11 @@ stdenv.mkDerivation rec {
46 sha256 = "1bywmdj54glzd0kffvr27r84n4dsd0pskkbmh59mllbxvj0qwy7f";
48 sha256 = "1bywmdj54glzd0kffvr27r84n4dsd0pskkbmh59mllbxvj0qwy7f";
47 };
49 };
48
50
49− buildInputs = [ makeWrapper less which unzip ];
51+ nativeBuildInputs = [ makeWrapper fakeLess which unzip ];
50
52
51 unpackPhase =
53 unpackPhase =
52 ''
54 ''
53− echo -e 'q\ny' | sh -xe $src
55+ echo -e '\ny' | sh -xe $src
54 cd TeamSpeak*
56 cd TeamSpeak*
55 '';
57 '';
56
58