From 166442660b176cc886777c291cc8599ea187aab1 Mon Sep 17 00:00:00 2001 From: Christoph Neidahl Date: Tue, 5 Sep 2023 23:15:46 +0200 Subject: [PATCH] lomiri.geonames: Use devdoc for documentation instead (#253407) Which is apparently a thing that already handles gtk-doc documentation moving, and more closely aligns with upstream's feedback on the merge request. --- pkgs/desktops/lomiri/development/geonames/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lomiri/development/geonames/default.nix b/pkgs/desktops/lomiri/development/geonames/default.nix index b3ee9dc25ef7..ee4a3b77b72b 100644 --- a/pkgs/desktops/lomiri/development/geonames/default.nix +++ b/pkgs/desktops/lomiri/development/geonames/default.nix @@ -36,16 +36,16 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withExamples [ "bin" ] ++ lib.optionals withDocumentation [ - "doc" + "devdoc" ]; patches = [ # Improves install locations of demo & docs # Remove when https://gitlab.com/ubports/development/core/geonames/-/merge_requests/3 merged & in release (fetchpatch { - name = "0001-geonames-Use-GNUInstallDirs-more.patch"; - url = "https://gitlab.com/OPNA2608/geonames/-/commit/e64a391fc213b2629da1c8bbf975fd62a2973c51.patch"; - hash = "sha256-HPYDtIy1WUrZLPzvKh4aezrT/LniZkNX+PeQ9YB85RY="; + name = "0001-geonames-Use-CMAKE_INSTALL_BINDIR-for-install.patch"; + url = "https://gitlab.com/OPNA2608/geonames/-/commit/3bca6d4d02843aed851a0a7480d5cd5ac02b4cda.patch"; + hash = "sha256-vwffuMKpIqymYaiGEvnNeVXLmnz5e4aBpg55fnNbjKs="; }) ];