diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-03-06 19:56:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-06 19:56:36 +0000 |
| commit | b49ef26eca958c965bb327cc6bbbcce430c3b96d (patch) | |
| tree | f4822950e6b072089d97af3f61926dba6900e122 /pkgs/applications | |
| parent | c8664a2640dea279ee2b623ea46aa3c4178770df (diff) | |
| parent | 19130ebc5d05cc7720335c92d68a4fd1faf28dc0 (diff) | |
| download | nixpkgs-b49ef26eca958c965bb327cc6bbbcce430c3b96d.tar nixpkgs-b49ef26eca958c965bb327cc6bbbcce430c3b96d.tar.gz nixpkgs-b49ef26eca958c965bb327cc6bbbcce430c3b96d.tar.bz2 nixpkgs-b49ef26eca958c965bb327cc6bbbcce430c3b96d.tar.lz nixpkgs-b49ef26eca958c965bb327cc6bbbcce430c3b96d.tar.xz nixpkgs-b49ef26eca958c965bb327cc6bbbcce430c3b96d.tar.zst nixpkgs-b49ef26eca958c965bb327cc6bbbcce430c3b96d.zip | |
Merge pull request #36377 from oxij/pkgs/fix-pulseaudio-references
tree-wide: fix pulseaudio references; fix SDL expressions
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox-bin/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix | 22 |
2 files changed, 15 insertions, 13 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 12cf5c30df4..3a6dd626ac6 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, config, wrapGAppsHook +{ lib, stdenv, fetchurl, config, wrapGAppsHook , alsaLib , atk , cairo @@ -87,7 +87,7 @@ stdenv.mkDerivation { libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc alsaLib - alsaLib.dev + (lib.getDev alsaLib) atk cairo curl @@ -124,7 +124,7 @@ stdenv.mkDerivation { pango libheimdal libpulseaudio - libpulseaudio.dev + (lib.getDev libpulseaudio) systemd ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 67b116274a2..bf564a6a192 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,6 +4,8 @@ , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: +with lib; + mkDerivation rec { name = "telegram-desktop-${version}"; version = "1.2.6"; @@ -45,7 +47,7 @@ mkDerivation rec { enableParallelBuilding = true; - GYP_DEFINES = lib.concatStringsSep "," [ + GYP_DEFINES = concatStringsSep "," [ "TDESKTOP_DISABLE_CRASH_REPORTS" "TDESKTOP_DISABLE_AUTOUPDATE" "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" @@ -57,14 +59,14 @@ mkDerivation rec { "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" "-I${minizip}/include/minizip" # See Telegram/gyp/qt.gypi - "-I${qtbase.dev}/mkspecs/linux-g++" - ] ++ lib.concatMap (x: [ - "-I${qtbase.dev}/include/${x}" - "-I${qtbase.dev}/include/${x}/${qtbase.version}" - "-I${qtbase.dev}/include/${x}/${qtbase.version}/${x}" - "-I${libopus.dev}/include/opus" - "-I${alsaLib.dev}/include/alsa" - "-I${libpulseaudio.dev}/include/pulse" + "-I${getDev qtbase}/mkspecs/linux-g++" + ] ++ concatMap (x: [ + "-I${getDev qtbase}/include/${x}" + "-I${getDev qtbase}/include/${x}/${qtbase.version}" + "-I${getDev qtbase}/include/${x}/${qtbase.version}/${x}" + "-I${getDev libopus}/include/opus" + "-I${getDev alsaLib}/include/alsa" + "-I${getDev libpulseaudio}/include/pulse" ]) [ "QtCore" "QtGui" "QtDBus" ]; CPPFLAGS = NIX_CFLAGS_COMPILE; @@ -121,7 +123,7 @@ mkDerivation rec { -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," ''; - meta = with lib; { + meta = { description = "Telegram Desktop messaging app"; license = licenses.gpl3; platforms = platforms.linux; |