nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 07:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

telegram/tdesktop: fix pulseaudio references

Browse Source
This commit is contained in:
Jan Malakhovski 2018-02-23 04:19:05 +00:00
parent 0c7b8931f9
commit 7966e0efeb
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -4,6 +4,8 @@
, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
}: }:
with lib;
mkDerivation rec { mkDerivation rec {
name = "telegram-desktop-${version}"; name = "telegram-desktop-${version}";
version = "1.2.6"; version = "1.2.6";
@ -45,7 +47,7 @@ mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
GYP_DEFINES = lib.concatStringsSep "," [ GYP_DEFINES = concatStringsSep "," [
"TDESKTOP_DISABLE_CRASH_REPORTS" "TDESKTOP_DISABLE_CRASH_REPORTS"
"TDESKTOP_DISABLE_AUTOUPDATE" "TDESKTOP_DISABLE_AUTOUPDATE"
"TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
@ -57,14 +59,14 @@ mkDerivation rec {
"-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
"-I${minizip}/include/minizip" "-I${minizip}/include/minizip"
# See Telegram/gyp/qt.gypi # See Telegram/gyp/qt.gypi
"-I${qtbase.dev}/mkspecs/linux-g++" "-I${getDev qtbase}/mkspecs/linux-g++"
] ++ lib.concatMap (x: [ ] ++ concatMap (x: [
"-I${qtbase.dev}/include/${x}" "-I${getDev qtbase}/include/${x}"
"-I${qtbase.dev}/include/${x}/${qtbase.version}" "-I${getDev qtbase}/include/${x}/${qtbase.version}"
"-I${qtbase.dev}/include/${x}/${qtbase.version}/${x}" "-I${getDev qtbase}/include/${x}/${qtbase.version}/${x}"
"-I${libopus.dev}/include/opus" "-I${getDev libopus}/include/opus"
"-I${alsaLib.dev}/include/alsa" "-I${getDev alsaLib}/include/alsa"
"-I${libpulseaudio.dev}/include/pulse" "-I${getDev libpulseaudio}/include/pulse"
]) [ "QtCore" "QtGui" "QtDBus" ]; ]) [ "QtCore" "QtGui" "QtDBus" ];
CPPFLAGS = NIX_CFLAGS_COMPILE; CPPFLAGS = NIX_CFLAGS_COMPILE;
@ -121,7 +123,7 @@ mkDerivation rec {
-e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","
''; '';
meta = with lib; { meta = {
description = "Telegram Desktop messaging app"; description = "Telegram Desktop messaging app";
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.linux; platforms = platforms.linux;