Skip to content

[Backport staging-24.11] qrencode: fix build failure#410581

Merged
philiptaron merged 2 commits intoNixOS:staging-24.11from
stefano-m:backport-fix-qrencode-build-failure
May 26, 2025
Merged

[Backport staging-24.11] qrencode: fix build failure#410581
philiptaron merged 2 commits intoNixOS:staging-24.11from
stefano-m:backport-fix-qrencode-build-failure

Conversation

@stefano-m
Copy link
Contributor

This is a manual backport of #407835

Ref: #407835 (comment)

Cc @philiptaron


Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 4.workflow: backport This targets a stable branch label May 24, 2025
@stefano-m stefano-m mentioned this pull request May 24, 2025
13 tasks
Copy link
Member

@Prince213 Prince213 left a comment

Choose a reason for hiding this comment

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

Please format with nix fmt.
Also, please use -x when backporting changes.

https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#manually-backporting-changes

@stefano-m
Copy link
Contributor Author

Please format with nix fmt. Also, please use -x when backporting changes.

https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#manually-backporting-changes

I am fixing the build failures.

I can't cherry pick because the file is different between the two branches.

@github-actions github-actions bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels May 24, 2025
stefano-m added 2 commits May 26, 2025 06:16
The source tarball is no longer available at <https://fukuchi.org/works/qrencode/qrencode-4.1.1.tar.gz>.

```
$ curl -I 'https://fukuchi.org/works/qrencode/qrencode-4.1.1.tar.gz'
HTTP/1.1 404 Not Found
Date: Sat, 17 May 2025 07:13:20 GMT
Server: Apache/2.4.62 (Debian)
Strict-Transport-Security: max-age=31536000
Content-Type: text/html; charset=iso-8859-
```

However, we can download it from the official repository on GitHub as mentioned in the project's home page[1].

To make the package build, we use autoreconfHook to mimic the repo's `autogen.sh` because the GitHub repo does not contain the configure script as mentioned in the project's README[2]:

> If there is no "configure" script in the source code directory, run
> "autogen.sh" at first to generate it - this is mandatory if you downloaded
> the source from GitHub.

[1] https://web.archive.org/web/20250413215821/https://fukuchi.org/en/works/qrencode/
[2] https://github.com/fukuchi/libqrencode/blob/50b3e5725cafccfde038c0833cdaa5b1c28491e2/README.md#compile--install

(cherry picked from commit 04db9fe)
Nix fails with an infinite recursion error When running the qrencode tests with
SDL2 in nativeCheckInputs.

Removing the dependency fixes the error and the tests still run successfully.

(cherry picked from commit b8246ba)
@philiptaron
Copy link
Contributor

We can use git cherry-pick -x, we just have to resolve the merge conflicts. As @Prince213 points out, that's what the conventions require. I've done that and force-pushed to the PR branch. There is no change to the diff.

@philiptaron philiptaron merged commit 9da7410 into NixOS:staging-24.11 May 26, 2025
15 of 17 checks passed
@stefano-m
Copy link
Contributor Author

We can use git cherry-pick -x, we just have to resolve the merge conflicts. As @Prince213 points out, that's what the conventions require. I've done that and force-pushed to the PR branch. There is no change to the diff.

Sorry about that @philiptaron and @Prince213

My bad.

Thank you for fixing the commits.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants