Merge branch 'qt-5-reduce-relocations'

pkgs/development/libraries/qt-5/5.5/qtbase/default.nix

@@ -131,7 +131,7 @@ stdenv.mkDerivation {
     -rpath
     -optimized-qmake
     -strip
-    -reduce-relocations
+    -no-reduce-relocations
     -system-proxies
     -pkg-config
 

pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh

@@ -61,11 +61,6 @@ _qtMultioutDevs() {
 
 preFixupHooks+=(_qtMultioutDevs)
 
-if [[ -z "$NIX_QT_PIC" ]]; then
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC"
-    export NIX_QT_PIC=1
-fi
-
 _qtSetCMakePrefix() {
     export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}"
 }

pkgs/development/libraries/qt-5/5.6/qtbase/default.nix

@@ -107,7 +107,7 @@ stdenv.mkDerivation {
     -rpath
     -optimized-qmake
     -strip
-    -reduce-relocations
+    -no-reduce-relocations
     -system-proxies
     -pkg-config
 

pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh

@@ -61,11 +61,6 @@ _qtMultioutDevs() {
 
 preFixupHooks+=(_qtMultioutDevs)
 
-if [[ -z "$NIX_QT_PIC" ]]; then
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC"
-    export NIX_QT_PIC=1
-fi
-
 _qtSetCMakePrefix() {
     export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}"
 }

pkgs/development/libraries/qt-5/5.7/qtbase/default.nix

@@ -106,7 +106,7 @@ stdenv.mkDerivation {
     -rpath
     -optimized-qmake
     -strip
-    -reduce-relocations
+    -no-reduce-relocations
     -system-proxies
     -pkg-config
 

pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh

@@ -61,11 +61,6 @@ _qtMultioutDevs() {
 
 preFixupHooks+=(_qtMultioutDevs)
 
-if [[ -z "$NIX_QT_PIC" ]]; then
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC"
-    export NIX_QT_PIC=1
-fi
-
 _qtSetCMakePrefix() {
     export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}"
 }