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

bitwarden-cli: Add xcodebuild to darwin build input. #340138

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

sixtysecrun
Copy link

Description of changes

Add xcodebuild to darwin build input. It fixes the error:

npm error FileNotFoundError: [Errno 2] No such file or directory: 'xcodebuild'

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.

@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Sep 6, 2024
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Sep 6, 2024
@sixtysecrun
Copy link
Author

@dotlambda Are you able to review this pull request?

@@ -34,6 +34,7 @@ buildNpmPackage rec {
] ++ lib.optionals stdenv.isDarwin [
cctools
xcbuild.xcrun
xcbuild.xcodebuild
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
xcbuild.xcodebuild
xcodebuild

Copy link
Contributor

Choose a reason for hiding this comment

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

error: attribute 'xcodebuild' missing

   at /ofborg/checkout/1/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/ofborg-evaluator-0/pkgs/by-name/bi/bitwarden-cli/package.nix:37:5:

       36|     xcbuild.xcrun
       37|     xcbuild.xcodebuild
         |     ^
       38|   ];

Copy link
Author

Choose a reason for hiding this comment

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

@khaneliman With the suggested change there is an error:

error: undefined variable 'xcodebuild'
       at /home/runner/work/nixpkgs/nixpkgs/pkgs/by-name/bi/bitwarden-cli/package.nix:38:5:
           37|     xcbuild.xcrun
           38|     xcodebuild
             |     ^
           39|   ];

Copy link
Contributor

Choose a reason for hiding this comment

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

Would still needed to be added to inputs.

@sixtysecrun sixtysecrun force-pushed the fix-bitwarden-darwin-build branch 3 times, most recently from bf102eb to 0754cbe Compare September 29, 2024 06:19
@FliegendeWurst FliegendeWurst added the awaiting_changes (old Marvin label, do not use) label Nov 9, 2024
Fixes the error:

npm error FileNotFoundError: [Errno 2] No such file or directory: 'xcodebuild'
@sixtysecrun sixtysecrun force-pushed the fix-bitwarden-darwin-build branch from 0754cbe to 562e663 Compare November 16, 2024 10:46
@ofborg ofborg bot requested a review from dotlambda November 16, 2024 23:50
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 16, 2024
@dotlambda
Copy link
Member

This seems to no longer be necessary with #350601, where the build fails for a different reason.

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12. first-time contribution This PR is the author's first one; please be gentle! awaiting_changes (old Marvin label, do not use)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants