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

zbar: use libintl on darwin #89298

Merged
merged 1 commit into from Jun 2, 2020
Merged

zbar: use libintl on darwin #89298

merged 1 commit into from Jun 2, 2020

Conversation

@soareschen
Copy link
Contributor

soareschen commented Jun 1, 2020

Motivation for this change

#88527 is broken on MacOS with missing dependency to libintl. This fixes the build.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

This change is Reviewable

@ofborg ofborg bot added the 6.topic: darwin label Jun 1, 2020
Copy link
Contributor

bjornfor left a comment

"libintlOrEmpty" seemed to be phased out in 2018, according to its entry in pkgs/top-level/aliases.nix.

@soareschen
Copy link
Contributor Author

soareschen commented Jun 2, 2020

"libintlOrEmpty" seemed to be phased out in 2018, according to its entry in pkgs/top-level/aliases.nix.

Got it. I have updated it to use libintl following the pattern in #37012.

@bjornfor
Copy link
Contributor

bjornfor commented Jun 2, 2020

Please squash commits, then I'll merge.

@soareschen soareschen force-pushed the scrive:zbar-libintl-darwin branch from 609a670 to 72135fd Jun 2, 2020
@soareschen
Copy link
Contributor Author

soareschen commented Jun 2, 2020

Done.

@bjornfor bjornfor merged commit 30d9df5 into NixOS:master Jun 2, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="72135fd"; rev="72135fdddbe31e7d61c573324d306cf3cd2b8014"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="72135fd"; rev="72135fdddbe31e7d61c573324d306cf3cd2b8014"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="72135fd"; rev="72135fdddbe31e7d61c573324d306cf3cd2b8014"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="72135fd"; rev="72135fdddbe31e7d61c573324d306cf3cd2b8014"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="72135fd"; rev="72135fdddbe31e7d61c573324d306cf3cd2b8014"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="72135fd"; rev="72135fdddbe31e7d61c573324d306cf3cd2b8014"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="72135fd"; rev="72135fdddbe31e7d61c573324d306cf3cd2b8014"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
zbar, zbar.passthru.tests on aarch64-linux Success
Details
zbar, zbar.passthru.tests on x86_64-linux Success
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.