diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-03-03 09:35:42 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-03-03 09:35:42 +0100 |
| commit | 35e73c9dd590f1bb1678c23f352ecf59bb627758 (patch) | |
| tree | a7df3d926aea4f04e53a45350534c3237abefaa3 /pkgs/development/libraries/qt-5 | |
| parent | 7580727eb83f92e77810c897b498c83383ef2f60 (diff) | |
| parent | 1487031b239fba9838869fc85f141a12e9ee6213 (diff) | |
| download | nixpkgs-35e73c9dd590f1bb1678c23f352ecf59bb627758.tar nixpkgs-35e73c9dd590f1bb1678c23f352ecf59bb627758.tar.gz nixpkgs-35e73c9dd590f1bb1678c23f352ecf59bb627758.tar.bz2 nixpkgs-35e73c9dd590f1bb1678c23f352ecf59bb627758.tar.lz nixpkgs-35e73c9dd590f1bb1678c23f352ecf59bb627758.tar.xz nixpkgs-35e73c9dd590f1bb1678c23f352ecf59bb627758.tar.zst nixpkgs-35e73c9dd590f1bb1678c23f352ecf59bb627758.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtbase.nix | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index f5f5c69455f..92ac8a24201 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -301,7 +301,6 @@ stdenv.mkDerivation { then [ "-platform macx-clang" - "-no-use-gold-linker" "-no-fontconfig" "-qt-freetype" "-qt-libpng" @@ -329,9 +328,6 @@ stdenv.mkDerivation { "-glib" "-system-libjpeg" "-system-libpng" - # gold linker of binutils 2.28 generates duplicate symbols - # TODO: remove for newer version of binutils - "-no-use-gold-linker" ] ++ lib.optional withGtk3 "-gtk" ++ lib.optional (compareVersion "5.9.0" >= 0) "-inotify" |