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

make-desktopitem: desktop-file-utils is a nativeBuildInput #105099

Merged
merged 1 commit into from Nov 27, 2020
Merged

make-desktopitem: desktop-file-utils is a nativeBuildInput #105099

merged 1 commit into from Nov 27, 2020

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Nov 27, 2020

This fixes cross-compilation of a NixOS with the manual enabled.

Motivation for this change
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.

@flokli
make-desktopitem: desktop-file-utils is a nativeBuildInput
ae57646 
This fixes cross-compilation of a NixOS with the manual enabled.
@flokli flokli added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Nov 27, 2020
samueldr
samueldr approved these changes Nov 27, 2020
View reviewed changes
Copy link
Member

@samueldr samueldr left a comment

Choose a reason for hiding this comment

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

Only looked, didn't actively run.

@flokli flokli merged commit 25952ac into NixOS:master Nov 27, 2020
@flokli flokli deleted the nixos-cross-manual branch November 27, 2020 00:34
@B4dM4n B4dM4n mentioned this pull request Nov 27, 2020
Merged
10 tasks
@FRidh
Copy link
Member

FRidh commented Nov 29, 2020

As mentioned in #105151 this breaks the build of several packages, including thunderbird which is a channel blocker.

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

@samueldr samueldr samueldr approved these changes

@bjornfor bjornfor Awaiting requested review from bjornfor

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@flokli @FRidh @samueldr