From 609c49f7406d0d44fabebf5eb6cd145faff52eab Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 12 Jul 2023 08:47:25 +0200 Subject: lomiri.geonames: Use CMAKE_CROSSCOMPILING_EMULATOR instead of patching in emulator call --- pkgs/desktops/lomiri/development/geonames/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/lomiri/development/geonames/default.nix b/pkgs/desktops/lomiri/development/geonames/default.nix index c4e327caf93f..534ed28e106e 100644 --- a/pkgs/desktops/lomiri/development/geonames/default.nix +++ b/pkgs/desktops/lomiri/development/geonames/default.nix @@ -45,10 +45,6 @@ stdenv.mkDerivation (finalAttrs: { --replace "\''${CMAKE_INSTALL_DATADIR}/gtk-doc/html/\''${PROJECT_NAME}" "\''${CMAKE_INSTALL_DOCDIR}" substituteInPlace demo/CMakeLists.txt \ --replace 'RUNTIME DESTINATION bin' 'RUNTIME DESTINATION ''${CMAKE_INSTALL_BINDIR}' - '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - # Built for hostPlatform, executed during build - substituteInPlace src/CMakeLists.txt \ - --replace 'COMMAND mkdb' 'COMMAND ${stdenv.hostPlatform.emulator buildPackages} mkdb' ''; strictDeps = true; @@ -87,6 +83,9 @@ stdenv.mkDerivation (finalAttrs: { "-DWANT_TESTS=${lib.boolToString finalAttrs.doCheck}" # Keeps finding & using glib-compile-resources from buildInputs otherwise "-DCMAKE_PROGRAM_PATH=${lib.makeBinPath [ buildPackages.glib.dev ]}" + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + # only for cross without native execute support because the canExecute "emulator" call has a format that I can't get CMake to accept + "-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}" ]; preInstall = lib.optionalString withDocumentation '' -- cgit 1.4.1