comaps: init at 2025.08.13-8 #419820

ryand56 · 2025-06-25T08:43:09Z

Adds CoMaps, a community-led fork of Organic Maps.
https://codeberg.org/comaps/comaps

Closes #419794

Things done

Add a 👍 reaction to pull requests you find important.

acid-bong

Great code, thx for the contribution. A couple of notes

pkgs/by-name/co/comaps/package.nix

ryand56 · 2025-06-26T08:36:27Z

@ofborg build comaps

onny · 2025-07-29T22:42:47Z

Is this ready to review? Whats missing?

ryand56 · 2025-07-29T22:59:20Z

Is this ready to review? Whats missing?

No, the map is missing symbols

ryand56 · 2025-07-30T06:38:15Z

I can download maps just fine but no symbols. Also can't launch over wayland, have to use QT_QPA_PLATFORM=xcb

fgaz

I accidentally submitted a pr for the same package: #432574

There are a few things from there that I'd like to see here as well:

System dependencies (see cmakeFlags)
updateScript
Wayland support (qtwayland)

pkgs/by-name/co/comaps/package.nix

ryand56 · 2025-08-11T01:00:16Z

@fgaz I'm getting the same jansson issue here, #432574 (comment)
Apparently, the libs are in jansson.out but it doesn't seem to detect it

ryand56 · 2025-08-17T05:46:13Z

Okay, I'm getting a new issue now:

comaps> -- Configuring done (18.1s)
comaps> -- Generating done (0.4s)
comaps> -- Build files have been written to: /build/source/out/release
comaps> [ 50%] Building CXX object base/CMakeFiles/base.dir/fast_math.cpp.o
comaps> [ 50%] Building CXX object base/CMakeFiles/base.dir/Unity/unity_1_cxx.cxx.o
comaps> [ 50%] Building CXX object base/CMakeFiles/base.dir/Unity/unity_0_cxx.cxx.o
comaps> [ 50%] Building CXX object 3party/gflags/CMakeFiles/gflags_nothreads_static.dir/Unity/unity_0_cxx.cxx.o
comaps> [ 50%] Linking CXX static library libgflags_nothreads.a
comaps> qcs: invalid option -- 'g'
comaps> Usage: /nix/store/pbqah1qk4b5y14fqinr1h8zvhqy71v81-gcc-wrapper-14.3.0/bin/ar [emulation options] [-]{dmpqrstx}[abcDfilMNoOPsSTuvV] [--plugin <name>] [member-name] [count] archive-file file...
comaps>        /nix/store/pbqah1qk4b5y14fqinr1h8zvhqy71v81-gcc-wrapper-14.3.0/bin/ar -M [<mri-script]
comaps>  commands:
comaps>   d            - delete file(s) from the archive
comaps>   m[ab]        - move file(s) in the archive
comaps>   p            - print file(s) found in the archive
comaps>   q[f]         - quick append file(s) to the archive
comaps>   r[ab][f][u]  - replace existing or insert new file(s) into the archive
comaps>   s            - act as ranlib
comaps>   t[O][v]      - display contents of the archive
comaps>   x[o]         - extract file(s) from the archive
comaps>  command specific modifiers:
comaps>   [a]          - put file(s) after [member-name]
comaps>   [b]          - put file(s) before [member-name] (same as [i])
comaps>   [D]          - use zero for timestamps and uids/gids (default)
comaps>   [U]          - use actual timestamps and uids/gids
comaps>   [N]          - use instance [count] of name
comaps>   [f]          - truncate inserted file names
comaps>   [P]          - use full path names when matching
comaps>   [o]          - preserve original dates
comaps>   [O]          - display offsets of files in the archive
comaps>   [u]          - only replace files that are newer than current archive contents
comaps>  generic modifiers:
comaps>   [c]          - do not warn if the library had to be created
comaps>   [s]          - create an archive index (cf. ranlib)
comaps>   [l <text> ]  - specify the dependencies of this library
comaps>   [S]          - do not build a symbol table
comaps>   [T]          - deprecated, use --thin instead
comaps>   [v]          - be verbose
comaps>   [V]          - display the version number
comaps>   @<file>      - read options from <file>
comaps>   --target=BFDNAME - specify the target object format as BFDNAME
comaps>   --output=DIRNAME - specify the output directory for extraction operations
comaps>   --record-libdeps=<text> - specify the dependencies of this library
comaps>   --thin       - make a thin archive
comaps>  optional:
comaps>   --plugin <p> - load the specified plugin
comaps>  emulation options:
comaps>   No emulation specific options
comaps> /nix/store/pbqah1qk4b5y14fqinr1h8zvhqy71v81-gcc-wrapper-14.3.0/bin/ar: supported targets: elf64-x86-64 elf32-i386 elf32-iamcu elf32-x86-64 pei-i386 pe-x86-64 pei-x86-64 elf64-little elf64-big elf32-little elf32-big srec symbolsrec verilog tekhex binary ihex plugin
comaps> make[3]: *** [3party/gflags/CMakeFiles/gflags_nothreads_static.dir/build.make:101: 3party/gflags/libgflags_nothreads.a] Error 1
comaps> make[2]: *** [CMakeFiles/Makefile2:2042: 3party/gflags/CMakeFiles/gflags_nothreads_static.dir/all] Error 2
comaps> make[2]: *** Waiting for unfinished jobs....
comaps> [ 50%] Linking CXX static library libbase.a
comaps> qcs: invalid option -- 'e'
comaps> Usage: /nix/store/pbqah1qk4b5y14fqinr1h8zvhqy71v81-gcc-wrapper-14.3.0/bin/ar [emulation options] [-]{dmpqrstx}[abcDfilMNoOPsSTuvV] [--plugin <name>] [member-name] [count] archive-file file...
comaps>        /nix/store/pbqah1qk4b5y14fqinr1h8zvhqy71v81-gcc-wrapper-14.3.0/bin/ar -M [<mri-script]
comaps>  commands:
comaps>   d            - delete file(s) from the archive
comaps>   m[ab]        - move file(s) in the archive
comaps>   p            - print file(s) found in the archive
comaps>   q[f]         - quick append file(s) to the archive
comaps>   r[ab][f][u]  - replace existing or insert new file(s) into the archive
comaps>   s            - act as ranlib
comaps>   t[O][v]      - display contents of the archive
comaps>   x[o]         - extract file(s) from the archive
comaps>  command specific modifiers:
comaps>   [a]          - put file(s) after [member-name]
comaps>   [b]          - put file(s) before [member-name] (same as [i])
comaps>   [D]          - use zero for timestamps and uids/gids (default)
comaps>   [U]          - use actual timestamps and uids/gids
comaps>   [N]          - use instance [count] of name
comaps>   [f]          - truncate inserted file names
comaps>   [P]          - use full path names when matching
comaps>   [o]          - preserve original dates
comaps>   [O]          - display offsets of files in the archive
comaps>   [u]          - only replace files that are newer than current archive contents
comaps>  generic modifiers:
comaps>   [c]          - do not warn if the library had to be created
comaps>   [s]          - create an archive index (cf. ranlib)
comaps>   [l <text> ]  - specify the dependencies of this library
comaps>   [S]          - do not build a symbol table
comaps>   [T]          - deprecated, use --thin instead
comaps>   [v]          - be verbose
comaps>   [V]          - display the version number
comaps>   @<file>      - read options from <file>
comaps>   --target=BFDNAME - specify the target object format as BFDNAME
comaps>   --output=DIRNAME - specify the output directory for extraction operations
comaps>   --record-libdeps=<text> - specify the dependencies of this library
comaps>   --thin       - make a thin archive
comaps>  optional:
comaps>   --plugin <p> - load the specified plugin
comaps>  emulation options:
comaps>   No emulation specific options
comaps> /nix/store/pbqah1qk4b5y14fqinr1h8zvhqy71v81-gcc-wrapper-14.3.0/bin/ar: supported targets: elf64-x86-64 elf32-i386 elf32-iamcu elf32-x86-64 pei-i386 pe-x86-64 pei-x86-64 elf64-little elf64-big elf32-little elf32-big srec symbolsrec verilog tekhex binary ihex plugin
comaps> make[3]: *** [base/CMakeFiles/base.dir/build.make:133: base/libbase.a] Error 1
comaps> make[2]: *** [CMakeFiles/Makefile2:2522: base/CMakeFiles/base.dir/all] Error 2
comaps> make[1]: *** [CMakeFiles/Makefile2:6245: skin_generator/CMakeFiles/skin_generator_tool.dir/rule] Error 2
comaps> make: *** [Makefile:1385: skin_generator_tool] Error 2

New issue after skipping all the downloads:

comaps> FAILED: 3party/bsdiff-courgette/libbsdiff.a
comaps> : && /nix/store/dx4bdrs7mq3jfviqhszrc7l35ps9kg64-cmake-3.31.7/bin/cmake -E rm -f 3party/bsdiff-courgette/libbsdiff.a && /nix/store/pbqah1qk4b5y14fqinr1h8zvhqy71v81-gcc-wrapper-14.3.0/bin/ar --plugin  qcs 3party/bsdiff-courgette/libbsdiff.a 3party/bsdiff-courgette/CMakeFiles/bsdiff.dir/Unity/unity_0_cxx.cxx.o && /nix/store/pbqah1qk4b5y14fqinr1h8zvhqy71v81-gcc-wrapper-14.3.0/bin/ranlib --plugin  3party/bsdiff-courgette/libbsdiff.a && :
comaps> qcs: invalid option -- '3'
comaps> Usage: /nix/store/pbqah1qk4b5y14fqinr1h8zvhqy71v81-gcc-wrapper-14.3.0/bin/ar [emulation options] [-]{dmpqrstx}[abcDfilMNoOPsSTuvV] [--plugin <name>] [member-name] [count] archive-file file...
comaps>        /nix/store/pbqah1qk4b5y14fqinr1h8zvhqy71v81-gcc-wrapper-14.3.0/bin/ar -M [<mri-script]
comaps>  commands:
comaps>   d            - delete file(s) from the archive
comaps>   m[ab]        - move file(s) in the archive
comaps>   p            - print file(s) found in the archive
comaps>   q[f]         - quick append file(s) to the archive
comaps>   r[ab][f][u]  - replace existing or insert new file(s) into the archive
comaps>   s            - act as ranlib
comaps>   t[O][v]      - display contents of the archive
comaps>   x[o]         - extract file(s) from the archive
comaps>  command specific modifiers:
comaps>   [a]          - put file(s) after [member-name]
comaps>   [b]          - put file(s) before [member-name] (same as [i])
comaps>   [D]          - use zero for timestamps and uids/gids (default)
comaps>   [U]          - use actual timestamps and uids/gids
comaps>   [N]          - use instance [count] of name
comaps>   [f]          - truncate inserted file names
comaps>   [P]          - use full path names when matching
comaps>   [o]          - preserve original dates
comaps>   [O]          - display offsets of files in the archive
comaps>   [u]          - only replace files that are newer than current archive contents
comaps>  generic modifiers:
comaps>   [c]          - do not warn if the library had to be created
comaps>   [s]          - create an archive index (cf. ranlib)
comaps>   [l <text> ]  - specify the dependencies of this library
comaps>   [S]          - do not build a symbol table
comaps>   [T]          - deprecated, use --thin instead
comaps>   [v]          - be verbose
comaps>   [V]          - display the version number
comaps>   @<file>      - read options from <file>
comaps>   --target=BFDNAME - specify the target object format as BFDNAME
comaps>   --output=DIRNAME - specify the output directory for extraction operations
comaps>   --record-libdeps=<text> - specify the dependencies of this library
comaps>   --thin       - make a thin archive
comaps>  optional:
comaps>   --plugin <p> - load the specified plugin
comaps>  emulation options:
comaps>   No emulation specific options
comaps> /nix/store/pbqah1qk4b5y14fqinr1h8zvhqy71v81-gcc-wrapper-14.3.0/bin/ar: supported targets: elf64-x86-64 elf32-i386 elf32-iamcu elf32-x86-64 pei-i386 pe-x86-64 pei-x86-64 elf64-little elf64-big elf32-little elf32-big srec symbolsrec verilog tekhex binary ihex plugin

ryand56 · 2025-08-17T06:54:38Z

Okay, it seems to be an LTO related thing here: https://codeberg.org/comaps/comaps/src/commit/76ffc99abd714d84dc719c7bf549c54173a739b5/CMakeLists.txt#L125

onny · 2025-08-23T19:22:08Z

thank you!

i guess we should sooner or later make an own derivation for comaps instead of overriding organicmaps derivation here. otherwise LGTM

ryand56 force-pushed the init/comaps branch from 5d02edf to a425fd5 Compare June 25, 2025 08:47

ryand56 added the 2.status: work-in-progress label Jun 25, 2025

acid-bong reviewed Jun 25, 2025

View reviewed changes

pkgs/by-name/co/comaps/package.nix Outdated Show resolved Hide resolved

pkgs/by-name/co/comaps/package.nix Outdated Show resolved Hide resolved

pkgs/by-name/co/comaps/package.nix Outdated Show resolved Hide resolved

ryand56 force-pushed the init/comaps branch from a425fd5 to 5003d2f Compare June 25, 2025 21:02

ryand56 requested a review from acid-bong June 25, 2025 22:37

acid-bong approved these changes Jun 26, 2025

View reviewed changes

nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jun 26, 2025

ryand56 removed the 2.status: work-in-progress label Jun 26, 2025

ryand56 marked this pull request as ready for review June 26, 2025 07:36

ryand56 marked this pull request as draft June 26, 2025 22:56

ryand56 force-pushed the init/comaps branch from 5003d2f to 1e486a5 Compare June 28, 2025 07:12

nixpkgs-ci bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. and removed 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. labels Jun 28, 2025

ryand56 force-pushed the init/comaps branch from 1e486a5 to 78ce3a3 Compare July 1, 2025 07:20

nixpkgs-ci bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. labels Jul 1, 2025

ryand56 changed the title ~~comaps: init at 2025.06.22-5~~ comaps: init at 2025.06.30-22 Jul 1, 2025

ryand56 force-pushed the init/comaps branch from 78ce3a3 to 4260c58 Compare July 30, 2025 06:07

ryand56 changed the title ~~comaps: init at 2025.06.30-22~~ comaps: init at 2025.07.23-4 Jul 30, 2025

ryand56 marked this pull request as ready for review July 30, 2025 06:35

ryand56 added the 8.has: package (new) This PR adds a new package label Jul 31, 2025

acid-bong mentioned this pull request Aug 10, 2025

comaps: init at 2025.07.23-4 #432574

Closed

13 tasks

fgaz reviewed Aug 10, 2025

View reviewed changes

pkgs/by-name/co/comaps/package.nix Outdated Show resolved Hide resolved

ryand56 force-pushed the init/comaps branch from 4260c58 to 2e363c5 Compare August 11, 2025 00:58

ryand56 changed the title ~~comaps: init at 2025.07.23-4~~ comaps: init at 2025.08.10 Aug 11, 2025

nixpkgs-ci bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. and removed 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. labels Aug 11, 2025

ryand56 marked this pull request as draft August 11, 2025 01:10

ryand56 force-pushed the init/comaps branch 2 times, most recently from 5433fb5 to e1ddd84 Compare August 16, 2025 11:16

ryand56 changed the title ~~comaps: init at 2025.08.10~~ comaps: init at 2025.08.13-8 Aug 16, 2025

ryand56 force-pushed the init/comaps branch 2 times, most recently from 33b9aa8 to 14d56af Compare August 17, 2025 11:34

ryand56 mentioned this pull request Aug 17, 2025

jansson: fix cmake import prefix #434580

Merged

13 tasks

ryand56 added 2.status: blocked by pr/issue Another PR or issue is preventing this from being completed and removed 2.status: blocked by pr/issue Another PR or issue is preventing this from being completed labels Aug 21, 2025

ryand56 force-pushed the init/comaps branch from 14d56af to fb615f3 Compare August 23, 2025 07:13

ryand56 marked this pull request as ready for review August 23, 2025 07:19

comaps: init at 2025.08.13-8

8852657

ryand56 force-pushed the init/comaps branch from fb615f3 to 8852657 Compare August 23, 2025 07:48

onny merged commit 89dd666 into NixOS:master Aug 23, 2025
25 of 27 checks passed

ryand56 deleted the init/comaps branch August 23, 2025 19:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

comaps: init at 2025.08.13-8 #419820

comaps: init at 2025.08.13-8 #419820

Uh oh!

ryand56 commented Jun 25, 2025 •

edited

Loading

Uh oh!

acid-bong left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ryand56 commented Jun 26, 2025

Uh oh!

onny commented Jul 29, 2025

Uh oh!

ryand56 commented Jul 29, 2025

Uh oh!

ryand56 commented Jul 30, 2025 •

edited

Loading

Uh oh!

fgaz left a comment

Uh oh!

Uh oh!

ryand56 commented Aug 11, 2025

Uh oh!

ryand56 commented Aug 17, 2025 •

edited

Loading

Uh oh!

ryand56 commented Aug 17, 2025 •

edited

Loading

Uh oh!

onny commented Aug 23, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

comaps: init at 2025.08.13-8 #419820

comaps: init at 2025.08.13-8 #419820

Uh oh!

Conversation

ryand56 commented Jun 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Things done

Uh oh!

acid-bong left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ryand56 commented Jun 26, 2025

Uh oh!

onny commented Jul 29, 2025

Uh oh!

ryand56 commented Jul 29, 2025

Uh oh!

ryand56 commented Jul 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fgaz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ryand56 commented Aug 11, 2025

Uh oh!

ryand56 commented Aug 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ryand56 commented Aug 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

onny commented Aug 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ryand56 commented Jun 25, 2025 •

edited

Loading

ryand56 commented Jul 30, 2025 •

edited

Loading

ryand56 commented Aug 17, 2025 •

edited

Loading

ryand56 commented Aug 17, 2025 •

edited

Loading

onny commented Aug 23, 2025 •

edited

Loading