Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 291dac48cf83
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: faab2914f3c3
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 27, 2020

  1. 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.
    @primeos
    primeos committed Jan 27, 2020
    Copy the full SHA
    faab291 View commit details
Showing with 0 additions and 14 deletions.
  1. +0 −14 pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
14 changes: 0 additions & 14 deletions pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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