diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2015-04-04 13:26:21 +0300 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2015-04-04 13:26:21 +0300 |
| commit | ba82a5d60949bf4057bc7d422f146b5a3f8f2101 (patch) | |
| tree | a3ed9f2f49e241724eeaae20a4eb139b5287c4fc /pkgs | |
| parent | 4b0e70f89a550cff131497dcf7f28a75e3d8ac53 (diff) | |
| parent | 9bc82e0952c270c9ae0d4294a866ad25e38e2672 (diff) | |
| download | nixpkgs-ba82a5d60949bf4057bc7d422f146b5a3f8f2101.tar nixpkgs-ba82a5d60949bf4057bc7d422f146b5a3f8f2101.tar.gz nixpkgs-ba82a5d60949bf4057bc7d422f146b5a3f8f2101.tar.bz2 nixpkgs-ba82a5d60949bf4057bc7d422f146b5a3f8f2101.tar.lz nixpkgs-ba82a5d60949bf4057bc7d422f146b5a3f8f2101.tar.xz nixpkgs-ba82a5d60949bf4057bc7d422f146b5a3f8f2101.tar.zst nixpkgs-ba82a5d60949bf4057bc7d422f146b5a3f8f2101.zip | |
Merge pull request #5142 from bosu/static-proot
proot: allow static compilation
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/talloc/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/proot/default.nix | 6 |
2 files changed, 8 insertions, 2 deletions
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" ''; |