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

win-dll-links: also copy dll from dependencies #252459

Merged
merged 1 commit into from
Aug 31, 2023

Conversation

brano543
Copy link
Contributor

@brano543 brano543 commented Aug 30, 2023

Description of changes

Copies Windows dependencies. Refactored changes from #227818. DLLs get copied to output path and are correctly symlinked. Tested with wine64 that application can run correctly and link properly.

Fixes #38451

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.11 Release Notes (or backporting 23.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.

@vcunat
Copy link
Member

vcunat commented Aug 31, 2023

(I'm not a good person for Windows stuff.)

@brano543
Copy link
Contributor Author

@vcunat I have tested the changes and DLLs get copied to output directory. I have also tested to run with wine64 and executable can run being able to find all dependencies.

@Artturin
Copy link
Member

_7zz used to fail to run, now it runs.

tree result/bin
result/bin
├── 7zz.exe
└── mcfgthread-12.dll -> ../../wmgj476qjfw26f9aij1d64lxrjfv6kk0-mcfgthreads-x86_64-w64-mingw32-git/bin/mcfgthread-12.dll

@Artturin Artturin force-pushed the win-dll-link branch 2 times, most recently from f4a6080 to 5551a5b Compare August 31, 2023 18:46
Fixes running `pkgsCross.mingwW64._7zz` in wine.

Fixes issue 38451

```
tree result/bin
result/bin
├── 7zz.exe
└── mcfgthread-12.dll -> ../../wmgj476qjfw26f9aij1d64lxrjfv6kk0-mcfgthreads-x86_64-w64-mingw32-git/bin/mcfgthread-12.dll
```

Co-authored-by: marius david <marius@mariusdavid.fr>
Copy link
Member

@Artturin Artturin left a comment

Choose a reason for hiding this comment

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

Let's merge quickly

@Artturin Artturin merged commit 1c574b4 into NixOS:staging Aug 31, 2023
17 checks passed
@brano543 brano543 deleted the win-dll-link branch August 31, 2023 23:40
vcunat added a commit that referenced this pull request Sep 1, 2023
...into staging-next.  It's a topologically earlier remerge.
Copy link
Contributor

Successfully created backport PR for release-23.05:

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.

4 participants