From 437e8e07346c8cdc668a0ee756b9d690228820f1 Mon Sep 17 00:00:00 2001 From: Christoph Neidahl Date: Wed, 5 Jul 2023 13:34:57 +0200 Subject: [PATCH] lomiri.cmake-extras: Change default QML location back to CMAKE_INSTALL_PREFIX Going `${CMAKE_INSTALL_BINDIR}/../` looks weird. Derivations that want them in a non-`out` output can just set the `QMLFILES_DESTINATION` CMake flag as needed. Co-authored-by: rewine --- pkgs/desktops/lomiri/development/cmake-extras/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/lomiri/development/cmake-extras/default.nix b/pkgs/desktops/lomiri/development/cmake-extras/default.nix index e1eb805dfaec..ee5665cd668f 100644 --- a/pkgs/desktops/lomiri/development/cmake-extras/default.nix +++ b/pkgs/desktops/lomiri/development/cmake-extras/default.nix @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation { # This is in a function that reverse dependencies use to determine where to install their files to substituteInPlace src/QmlPlugins/QmlPluginsConfig.cmake \ - --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_BINDIR}/../${qtbase.qtQmlPrefix}" + --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" ''; strictDeps = true;