Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 71704e81293c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9bc5c624e5b6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 4, 2019

  1. smbnetfs: Fix build against attr>=2.4.48 

    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.
    @knedlsepp
    knedlsepp committed Mar 4, 2019
    Copy the full SHA
    b7c146c View commit details

  2. Merge pull request #56843 from knedlsepp/fix-smbnetfs 

    Fix smbnetfs
    @7c6f434c
    7c6f434c authored Mar 4, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9bc5c62 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/tools/filesystems/smbnetfs/default.nix
4 changes: 4 additions & 0 deletions pkgs/tools/filesystems/smbnetfs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoconf ];
buildInputs = [ fuse samba glib attr libsecret ];

postPatch = ''
substituteInPlace src/function.c --replace "attr/xattr.h" "sys/xattr.h"
'';

meta = with stdenv.lib; {
description = "A FUSE FS for mounting Samba shares";
maintainers = with maintainers; [ raskin ];