Skip to content

Comments

pdal: fix libdir path in pkgconfig file#331092

Merged
SuperSandro2000 merged 1 commit intoNixOS:masterfrom
imincik:pdal-fix-pkgconfig-file
Jul 31, 2024
Merged

pdal: fix libdir path in pkgconfig file#331092
SuperSandro2000 merged 1 commit intoNixOS:masterfrom
imincik:pdal-fix-pkgconfig-file

Conversation

@imincik
Copy link
Contributor

@imincik imincik commented Jul 30, 2024

Description of changes

Fix libdir path in lib/pkgconfig/pdal.pc file.

pdal.pc without the patch:

prefix=/nix/store/65ikg5m0rsl2p4p22gpsgwkqi8cizkvz-pdal-2.7.2
exec_prefix=/nix/store/65ikg5m0rsl2p4p22gpsgwkqi8cizkvz-pdal-2.7.2/bin
libdir=/nix/store/65ikg5m0rsl2p4p22gpsgwkqi8cizkvz-pdal-2.7.2//nix/store/65ikg5m0rsl2p4p22gpsgwkqi8cizkvz-pdal-2.7.2/lib
includedir=/nix/store/65ikg5m0rsl2p4p22gpsgwkqi8cizkvz-pdal-2.7.2/include

Name: PDAL
Description: Point Data Abstraction Library
Requires:   gdal libxml-2.0
Version: 2.7.2
Libs: -L${libdir} -lpdalcpp
Cflags: -I${includedir}/pdal  


pdal.pc with the patch:

prefix=/nix/store/wmkwbkqj7hzfpnvjzv1jpsd5biv1x26v-pdal-2.7.2
exec_prefix=/nix/store/wmkwbkqj7hzfpnvjzv1jpsd5biv1x26v-pdal-2.7.2/bin
libdir=/nix/store/wmkwbkqj7hzfpnvjzv1jpsd5biv1x26v-pdal-2.7.2/lib
includedir=/nix/store/wmkwbkqj7hzfpnvjzv1jpsd5biv1x26v-pdal-2.7.2/include

Name: PDAL
Description: Point Data Abstraction Library
Requires:   gdal libxml-2.0
Version: 2.7.2
Libs: -L${libdir} -lpdalcpp
Cflags: -I${includedir}/pdal  

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.11 Release Notes (or backporting 23.11 and 24.05 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.

@ofborg ofborg bot requested review from autra, l0b0, nh2, nialov, sikmir and willcohen July 30, 2024 16:34
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jul 30, 2024
@imincik imincik force-pushed the pdal-fix-pkgconfig-file branch from 98751c2 to 91b755c Compare July 31, 2024 08:26
@imincik imincik force-pushed the pdal-fix-pkgconfig-file branch from 91b755c to 4cfab1b Compare July 31, 2024 08:27
@imincik imincik requested a review from jopejoe1 July 31, 2024 08:27
@SuperSandro2000
Copy link
Member

Also reminds me that we need a hook similar to cmake for this.

@SuperSandro2000 SuperSandro2000 merged commit 3e1f1be into NixOS:master Jul 31, 2024
@imincik
Copy link
Contributor Author

imincik commented Jul 31, 2024

Also reminds me that we need a hook similar to cmake for this.

Sorry, I don't understand this comment.

@SuperSandro2000
Copy link
Member

To many people did this wrong in cmake files that we just fail the build if this happens https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/cm/cmake/check-pc-files-hook.sh

@imincik
Copy link
Contributor Author

imincik commented Aug 1, 2024

To many people did this wrong in cmake files that we just fail the build if this happens https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/cm/cmake/check-pc-files-hook.sh

Great thanks, I didn't know about this hook !

imincik added a commit to imincik/geospatial-nix that referenced this pull request Aug 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants