pyrox.dev
lol
qtbase: fix plugin path in CMake modules
+11
-8
+3
-2
pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+3
-2
pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
···
237
237
postInstall = ''
238
238
find "$out" -name "*.cmake" | while read file; do
239
239
substituteInPlace "$file" \
240
-
--subst-var-by NIX_OUT "$out" \
241
-
--subst-var-by NIX_DEV "$dev"
240
+
--subst-var-by NIX_OUT "''${!outputLib}" \
241
+
--subst-var-by NIX_DEV "''${!outputDev}" \
242
+
--subst-var-by NIX_BIN "''${!outputBin}"
242
243
done
243
244
'';
244
245
+2
-2
pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch
+2
-2
pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch
···
306
306
307
307
!!IF !isEmpty(CMAKE_RELEASE_TYPE)
308
308
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
309
-
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
309
+
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_BIN@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
310
310
!!ENDIF
311
311
!!IF !isEmpty(CMAKE_DEBUG_TYPE)
312
312
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
313
-
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
313
+
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_BIN@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
314
314
!!ENDIF
315
315
316
316
list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
+3
-2
pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+3
-2
pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
···
269
269
''
270
270
find "$out" -name "*.cmake" | while read file; do
271
271
substituteInPlace "$file" \
272
-
--subst-var-by NIX_OUT "$out" \
273
-
--subst-var-by NIX_DEV "$dev"
272
+
--subst-var-by NIX_OUT "''${!outputLib}" \
273
+
--subst-var-by NIX_DEV "''${!outputDev}" \
274
+
--subst-var-by NIX_BIN "''${!outputBin}"
274
275
done
275
276
'';
276
277
+3
-2
pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
+3
-2
pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
···
72
72
if [ -n "$NIX_QT_SUBMODULE" ]; then
73
73
find "${!outputLib}" -name "*.cmake" | while read file; do
74
74
substituteInPlace "$file" \
75
-
--subst-var-by NIX_OUT "${!outputLib}" \
76
-
--subst-var-by NIX_DEV "${!outputDev}"
75
+
--subst-var-by NIX_OUT "${!outputLib}" \
76
+
--subst-var-by NIX_DEV "${!outputDev}" \
77
+
--subst-var-by NIX_BIN "${!outputBin}"
77
78
done
78
79
fi
79
80
}