diff options
author | Luca Bruno <lethalman88@gmail.com> | 2015-12-11 18:31:00 +0100 |
---|---|---|
committer | Luca Bruno <lethalman88@gmail.com> | 2015-12-11 18:31:00 +0100 |
commit | 5b0352a6a43fdd924a53cde4b81c15b755fa0a27 (patch) | |
tree | cf0fcc2be2f6d08c970f0322a63ff0a31d5d5dee /pkgs/tools/filesystems | |
parent | 2f0fe05543ce594eacf0310966914d6e19a42f88 (diff) | |
parent | 146784f835a6cadc65812c5adf76533c18e5be61 (diff) | |
download | nixpkgs-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar nixpkgs-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.gz nixpkgs-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.bz2 nixpkgs-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.lz nixpkgs-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.xz nixpkgs-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.zst nixpkgs-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.zip |
Merge branch 'master' into closure-size
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r-- | pkgs/tools/filesystems/f2fs-tools/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index f8fa5cc264d..073dc585e74 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "Userland tools for the f2fs filesystem"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ emery jagajaga ]; + maintainers = with maintainers; [ ehmry jagajaga ]; }; } diff --git a/pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch b/pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch index 86eb6f81869..c74b75b7e43 100644 --- a/pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch +++ b/pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch @@ -78,3 +78,23 @@ ifeq ($(HAVE_BUILDDEFS), yes) +--- xfsprogs-4.2.0/quota/Makefile ++++ xfsprogs-4.2.0/quota/Makefile +@@ -16,7 +16,6 @@ LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g") + + LLDLIBS = $(LIBXCMD) + LTDEPENDENCIES = $(LIBXCMD) +-LLDFLAGS = -static + + ifeq ($(ENABLE_READLINE),yes) + LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP) +--- xfsprogs-4.2.0/mdrestore/Makefile ++++ xfsprogs-4.2.0/mdrestore/Makefile +@@ -10,7 +10,6 @@ CFILES = xfs_mdrestore.c + + LLDLIBS = $(LIBXFS) $(LIBRT) $(LIBPTHREAD) $(LIBUUID) + LTDEPENDENCIES = $(LIBXFS) +-LLDFLAGS = -static + + default: depend $(LTCOMMAND) + |