diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 9aad51f9fad..d9f52d8d87c 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -24,6 +24,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/; diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 172da395374..be3cffb47eb 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" '';