From b1b5712c4342e9f771fd96ebc60082269b9f3ee8 Mon Sep 17 00:00:00 2001 From: Boris Sukholitko Date: Wed, 26 Nov 2014 20:37:58 +0200 Subject: [PATCH 1/2] talloc: export archive to allow static linkage --- pkgs/development/libraries/talloc/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 2459284b270..97b633cbff1 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; + postInstall = '' + ar qf $out/lib/libtalloc.a bin/default/talloc_5.o + ''; + meta = with stdenv.lib; { description = "Hierarchical pool based memory allocator with destructors"; homepage = http://tdb.samba.org/; From 9bc82e0952c270c9ae0d4294a866ad25e38e2672 Mon Sep 17 00:00:00 2001 From: Boris Sukholitko Date: Wed, 26 Nov 2014 20:42:33 +0200 Subject: [PATCH 2/2] proot: allow static build --- pkgs/tools/system/proot/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 3eaa85e41ea..4faf8e561d8 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, talloc }: +{ stdenv, fetchgit, talloc, enableStatic ? false }: stdenv.mkDerivation rec { name = "proot-${version}"; @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ talloc ]; - preBuild = '' + preBuild = stdenv.lib.optionalString enableStatic '' + export LDFLAGS="-static -L${talloc}/lib" + '' + '' substituteInPlace GNUmakefile --replace "/usr/local" "$out" '';