summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2020-01-27 12:44:42 +0100
committerMichael Weiss <dev.primeos@gmail.com>2020-01-27 16:41:49 +0100
commitfaab2914f3c3ef888e0826ee7a58e2f55d120d22 (patch)
tree317be1c91ea3f21d2b668e9e4eeee87a63df6a95 /pkgs
parent291dac48cf83794dc47bbf830df2457890f9bf7c (diff)
downloadnixpkgs-faab2914f3c3ef888e0826ee7a58e2f55d120d22.tar
nixpkgs-faab2914f3c3ef888e0826ee7a58e2f55d120d22.tar.gz
nixpkgs-faab2914f3c3ef888e0826ee7a58e2f55d120d22.tar.bz2
nixpkgs-faab2914f3c3ef888e0826ee7a58e2f55d120d22.tar.lz
nixpkgs-faab2914f3c3ef888e0826ee7a58e2f55d120d22.tar.xz
nixpkgs-faab2914f3c3ef888e0826ee7a58e2f55d120d22.tar.zst
nixpkgs-faab2914f3c3ef888e0826ee7a58e2f55d120d22.zip
tdesktop: Remove NIX_CFLAGS_COMPILE and CPPFLAGS
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.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix14
1 files changed, 0 insertions, 14 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 3f6d9c49898..6f7dc89f1e7 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -64,20 +64,6 @@ mkDerivation rec {
 
   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 = [
     "-Ddisable_autoupdate=ON"
     #"-DTDESKTOP_API_TEST=ON" # TODO: Officiall API credentials for Nixpkgs