From 4ae5f8a92aa1e8ae21c3e40d5cbb29fae424de1b Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sat, 2 Jun 2018 23:07:12 -0400 Subject: [PATCH] qt: remove install_name_tool stuff hopefully it's not needed - the frameworks are no longer there --- .../libraries/qt-5/modules/qtbase.nix | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 2bd832300282..0c7af9e185dd 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -374,24 +374,6 @@ stdenv.mkDerivation { '' + ( - if stdenv.isDarwin - then - '' - fixDarwinDylibNames_rpath() { - local flags=() - - for fn in "$@"; do - flags+=(-change "@rpath/$fn.framework/Versions/5/$fn" "$out/lib/$fn.framework/Versions/5/$fn") - done - - for fn in "$@"; do - echo "$fn: fixing dylib" - install_name_tool -id "$out/lib/$fn.framework/Versions/5/$fn" "''${flags[@]}" "$out/lib/$fn.framework/Versions/5/$fn" - done - } - fixDarwinDylibNames_rpath "QtConcurrent" "QtPrintSupport" "QtCore" "QtSql" "QtDBus" "QtTest" "QtGui" "QtWidgets" "QtNetwork" "QtXml" "QtOpenGL" - '' - else # fixup .pc file (where to find 'moc' etc.) '' sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \