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.

Sign up for GitHub

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

Jump to bottom

Fix dcmkt build #206265

Merged
merged 1 commit into from
Jan 13, 2023
Merged

Fix dcmkt build #206265

merged 1 commit into from
Jan 13, 2023

Conversation

StillerHarpo
Copy link
Contributor

Description of changes

The package wouldn't build because of

The following lines have issues (specifically '//' in paths).
3: libdir="${prefix}//nix/store/w7psws13xvps8mzkmcz4m4wrvfaqgazr-dcmtk-3.6.7/lib"
It is very likely that paths are being joined improperly.
ex: "${prefix}/@CMAKE_INSTALL_LIBDIR@" should be "@CMAKE_INSTALL_FULL_LIBDIR@"
Please see https://github.com/NixOS/nixpkgs/issues/144170 for more details.
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@StillerHarpo StillerHarpo mentioned this pull request Dec 15, 2022
Open
@ofborg ofborg bot requested a review from iimog December 15, 2022 15:41
bjornfor
bjornfor reviewed Dec 15, 2022
View reviewed changes
pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch Outdated
prefix="@CMAKE_INSTALL_PREFIX@"
exec_prefix="${prefix}"
- libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@"
+ libdir="@CMAKE_INSTALL_LIBDIR@"
Copy link
Contributor

Choose a reason for hiding this comment

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

If you make it CMAKE_INSTALL_FULL_LIBDIR you can submit the patch upstream.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done DCMTK/dcmtk#75

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks! I made some comments over there.

@siraben
Copy link
Member

siraben commented Dec 20, 2022

Result of nixpkgs-review pr 206265 run on aarch64-darwin 1

1 package built:
  • dcmtk

@cfhammill
Copy link
Contributor

While we wait for the upstream PR can we get this patch merged? @bjornfor @siraben

bjornfor
bjornfor reviewed Jan 11, 2023
View reviewed changes
pkgs/applications/science/medicine/dcmtk/default.nix
@@ -14,8 +15,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ libpng zlib libtiff libxml2 openssl libiconv ];

patches = [ ./0001-Fix-cmake.patch ];
Copy link
Contributor

Choose a reason for hiding this comment

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

Please add a comment next to the patch that links to the upstream PR.

bjornfor
bjornfor reviewed Jan 11, 2023
View reviewed changes
pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch
prefix="@CMAKE_INSTALL_PREFIX@"
exec_prefix="${prefix}"
- libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@"
+ libdir=@CMAKE_INSTALL_FULL_LIBDIR@"
Copy link
Contributor

Choose a reason for hiding this comment

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

The upstream PR has two hunks (https://github.com/DCMTK/dcmtk/pull/75/files), does this really work when only having one hunk?

Copy link
Contributor

Choose a reason for hiding this comment

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

this PR as is seems to work, perhaps the other hunk is specific to non-nix builds

@cfhammill
Copy link
Contributor

Tested successfully with nix run nixpkgs#nixpkgs-review pr 206265

@bcdarwin bcdarwin mentioned this pull request Jan 11, 2023
Merged
13 tasks
@StillerHarpo StillerHarpo requested review from bjornfor and cfhammill and removed request for cfhammill January 12, 2023 19:44
@ofborg ofborg bot removed the request for review from cfhammill January 12, 2023 19:55
@cfhammill
Copy link
Contributor

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

1 package built:
  • dcmtk

LGTM

@siraben siraben merged commit cca1b4f into NixOS:master Jan 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cfhammill cfhammill cfhammill approved these changes

@siraben siraben Awaiting requested review from siraben

@iimog iimog Awaiting requested review from iimog

@bjornfor bjornfor Awaiting requested review from bjornfor

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@StillerHarpo @siraben @cfhammill @bjornfor