public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tdesktop: Remove NIX_CFLAGS_COMPILE and CPPFLAGS

Browse Source 
This is not required anymore and therefore a refactoring/cleanup
(verified with diffoscope that only the output paths change).
Credit to @ilya-fedin for bringing this to my attention.
This commit is contained in:
Michael Weiss 2020-01-27 12:44:42 +01:00
parent 291dac48cf
commit faab2914f3
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,20 +64,6 @@ mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = [
"-I${minizip}/include/minizip"
# See Telegram/gyp/qt.gypi
"-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;
cmakeFlags = [ cmakeFlags = [
"-Ddisable_autoupdate=ON" "-Ddisable_autoupdate=ON"
#"-DTDESKTOP_API_TEST=ON" # TODO: Officiall API credentials for Nixpkgs #"-DTDESKTOP_API_TEST=ON" # TODO: Officiall API credentials for Nixpkgs