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

smbnetfs: Fix build #56843

Merged
merged 1 commit into from
Mar 4, 2019
Merged

smbnetfs: Fix build #56843

merged 1 commit into from
Mar 4, 2019

Conversation

knedlsepp
Copy link
Member

@knedlsepp knedlsepp commented Mar 4, 2019 •
edited
Loading

Motivation for this change

This fixes smbnetfs. Please backport to 19.03.
ZHF-19.03: #56826

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@knedlsepp
smbnetfs: Fix build against attr>=2.4.48
b7c146c 
The xattr.h header was removed from libattr in v2.4.48 but added to glibc in 2.27.
The location moved from attr/xattr.h to sys/xattr.h.
@GrahamcOfBorg GrahamcOfBorg added 6.topic: emacs Text editor 6.topic: erlang 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: haskell 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: pantheon The Pantheon desktop environment 6.topic: printing 6.topic: python 6.topic: qt/kde 6.topic: ruby 6.topic: rust 6.topic: steam 6.topic: vim 6.topic: xfce The Xfce Desktop Environment 8.has: changelog 8.has: documentation 8.has: module (update) This PR changes an existing module in `nixos/` 2.status: merge conflict This PR has merge conflicts with the target branch and removed 6.topic: emacs Text editor 6.topic: erlang 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: haskell 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: pantheon The Pantheon desktop environment labels Mar 4, 2019
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Mar 4, 2019
@7c6f434c 7c6f434c merged commit 9bc5c62 into NixOS:master Mar 4, 2019
7c6f434c added a commit that referenced this pull request Mar 4, 2019
@7c6f434c
Merge pull request #56843 from knedlsepp/fix-smbnetfs
c4c92ec 
Fix smbnetfs

(cherry picked from commit 9bc5c62)
@7c6f434c
Copy link
Member

7c6f434c commented Mar 4, 2019

c4c92ec

@knedlsepp knedlsepp changed the title Fix smbnetfs smbnetfs: Fix build Mar 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh Awaiting requested review from FRidh

@infinisil infinisil Awaiting requested review from infinisil

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@knedlsepp @7c6f434c @GrahamcOfBorg