diff options
| author | Will Dietz <github@wdtz.org> | 2019-03-01 10:39:02 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-01 10:39:02 -0600 |
| commit | e30d887597f3d4ed227703c3ad3782cba5c8e149 (patch) | |
| tree | 12baba361c98d6ddfb8b184e01e1b8ef5e097d4e | |
| parent | 79aca227e1f838aef7e6005e440be8c605439c4b (diff) | |
| parent | 5937a19a061800a39af1b404e9654714f4380fc0 (diff) | |
| download | nixlib-e30d887597f3d4ed227703c3ad3782cba5c8e149.tar nixlib-e30d887597f3d4ed227703c3ad3782cba5c8e149.tar.gz nixlib-e30d887597f3d4ed227703c3ad3782cba5c8e149.tar.bz2 nixlib-e30d887597f3d4ed227703c3ad3782cba5c8e149.tar.lz nixlib-e30d887597f3d4ed227703c3ad3782cba5c8e149.tar.xz nixlib-e30d887597f3d4ed227703c3ad3782cba5c8e149.tar.zst nixlib-e30d887597f3d4ed227703c3ad3782cba5c8e149.zip | |
Merge pull request #56561 from dtzWill/feature/qtbase-gold-linker-is-okay
qtbase: let build use gold linker if it wants, maybe works now
| -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 f5f5c69455f5..92ac8a242013 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" |