Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'

Conflicts:
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix
	nixpkgs/pkgs/development/node-packages/default.nix
	nixpkgs/pkgs/development/python-modules/priority/deadline.patch

2 files changed, 51 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/development/libraries/memorymapping/default.nix b/nixpkgs/pkgs/development/libraries/memorymapping/default.nix
new file mode 100644
index 000000000000..91af205f0320
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/memorymapping/default.nix
@@ -0,0 +1,45 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  pname = "memorymapping";
+  version = "unstable-2014-02-20";
+
+  src = fetchFromGitHub {
+    owner = "NimbusKit";
+    repo = "memorymapping";
+    rev = "fc285afe13cb9d56a40c647b8ed6d6bd40636af7";
+    sha256 = "sha256-9u/QvK9TDsKxcubINH2OAbx5fXXkKF0+YT7LoLDaF0M=";
+  };
+
+  dontConfigure = true;
+
+  buildPhase = ''
+    runHook preBuild
+
+    $CC -c src/fmemopen.c
+    $AR rcs libmemorymapping.a fmemopen.o
+    sed -e '1i#include <stdio.h>' -i src/fmemopen.h
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D libmemorymapping.a "$out"/lib/libmemorymapping.a
+    install -D src/fmemopen.h "$out"/include/fmemopen.h
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://nimbuskit.github.io/memorymapping/";
+    description = "fmemopen for Mac OS and iOS";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ veprbl ];
+    # Uses BSD-style funopen() to implement glibc-style fmemopen().
+    # Add more BSDs if you need to.
+    platforms = platforms.darwin;
+    broken = stdenv.isAarch64;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/memorymapping/setup-hook.sh b/nixpkgs/pkgs/development/libraries/memorymapping/setup-hook.sh
new file mode 100644
index 000000000000..5ee3470fe370
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/memorymapping/setup-hook.sh
@@ -0,0 +1,6 @@
+useMemorymapping () {
+  export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-include fmemopen.h";
+  export NIX_LDFLAGS="${NIX_LDFLAGS-}${NIX_LDFLAGS:+ }-lmemorymapping";
+}
+
+postHooks+=(useMemorymapping)