Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mosquitto: fix pkg-config files #273652

Merged
merged 1 commit into from
Dec 17, 2023
Merged

mosquitto: fix pkg-config files #273652

merged 1 commit into from
Dec 17, 2023

Conversation

sikmir
Copy link
Member

@sikmir sikmir commented Dec 11, 2023

Description of changes

  • Fix prefix in pkg-config files

Before:

$ cat result-dev/lib/pkgconfig/libmosquitto.pc
prefix=/nix/store/h1brpgrnvwfw546882wwvwg46469k6p1-mosquitto-2.0.18
exec_prefix=${prefix}
includedir=/nix/store/j9rrc2sz74c837zgws1in1cc82pgrra5-mosquitto-2.0.18-dev/include
libdir=${exec_prefix}/lib

Name: mosquitto
Description: mosquitto MQTT library (C bindings)
Version: 2.0.18
Cflags: -I${includedir}
Libs: -L${libdir} -lmosquitto

After:

$ cat result-dev/lib/pkgconfig/libmosquitto.pc
prefix=/nix/store/4anskp1303vbqzvzc7923k7yadawsfv1-mosquitto-2.0.18-lib
exec_prefix=${prefix}
includedir=/nix/store/l8hq7nl0cfh3iplnipmy2shbc4zr420q-mosquitto-2.0.18-dev/include
libdir=${exec_prefix}/lib

Name: mosquitto
Description: mosquitto MQTT library (C bindings)
Version: 2.0.18
Cflags: -I${includedir}
Libs: -L${libdir} -lmosquitto
  • Use uthash from nixpkgs instead of bundled one
  • No need make -C man, manpages are generated by default
  • No need -DWITH_THREADING=ON, it's ON by default

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@sikmir
Copy link
Member Author

sikmir commented Dec 12, 2023

Result of nixpkgs-review pr 273652 run on x86_64-linux 1

7 packages built:
  • collectd
  • domoticz
  • ebusd
  • mosquitto
  • mosquitto.dev
  • mosquitto.lib
  • owntracks-recorder

@sikmir
Copy link
Member Author

sikmir commented Dec 12, 2023

Result of nixpkgs-review pr 273652 run on x86_64-darwin 1

2 packages marked as broken and skipped:
  • collectd
  • domoticz
3 packages built:
  • mosquitto
  • mosquitto.dev
  • mosquitto.lib

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3087

pkgs/servers/mqtt/mosquitto/default.nix Outdated Show resolved Hide resolved
pkgs/servers/mqtt/mosquitto/default.nix Outdated Show resolved Hide resolved

postFixup = ''
echo "Fixing pkg-config files"
sed -i "s|^prefix=.*|prefix=$lib|g" $dev/lib/pkgconfig/*.pc
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be super awesome if we could fix the cmake file that generates this and upstream it.

- Fix prefix in pkg-config files
- Use uthash from nixpkgs instead of bundled one (preffered way)
- No need make -C man, manpages are generated by default
- No need -DWITH_THREADING=ON, it's ON by default
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1316

@pbsds
Copy link
Contributor

pbsds commented Dec 17, 2023

Result of nixpkgs-review pr 273652 run on x86_64-linux 1

7 packages built:
  • collectd
  • domoticz
  • ebusd
  • mosquitto
  • mosquitto.dev
  • mosquitto.lib
  • owntracks-recorder

nixos test also passes, LGTM. Thanks!

@pbsds pbsds merged commit 154bbaa into NixOS:master Dec 17, 2023
23 checks passed
@sikmir sikmir deleted the mosquitto branch December 17, 2023 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants