diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-04-13 12:04:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-13 12:04:32 -0400 |
| commit | 59c81160e7df5d5d1b143b1d2e46385debc6bfea (patch) | |
| tree | 6357d03a315666055aebcda1da18751dbaae229a /pkgs/development/libraries/talloc/default.nix | |
| parent | 14a008dba64ab32c677eee005d1cda3fe460b763 (diff) | |
| parent | a79a8f29bc509b2d51158846c9562e64e1239b4c (diff) | |
| download | nixpkgs-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar nixpkgs-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.gz nixpkgs-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.bz2 nixpkgs-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.lz nixpkgs-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.xz nixpkgs-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.zst nixpkgs-59c81160e7df5d5d1b143b1d2e46385debc6bfea.zip | |
Merge pull request #58504 from symphorien/static-proot
Static proot, wafHook cross compilation
Diffstat (limited to 'pkgs/development/libraries/talloc/default.nix')
| -rw-r--r-- | pkgs/development/libraries/talloc/default.nix | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 1fbbecf71a6..5a8ebe84ba6 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, pkgconfig, readline, libxslt , docbook_xsl, docbook_xml_dtd_42, fixDarwinDylibNames -, buildPackages +, wafHook }: stdenv.mkDerivation rec { @@ -11,23 +11,22 @@ stdenv.mkDerivation rec { sha256 = "1kk76dyav41ip7ddbbf04yfydb4jvywzi2ps0z2vla56aqkn11di"; }; - nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python + nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python wafHook docbook_xsl docbook_xml_dtd_42 ]; buildInputs = [ readline libxslt ]; - prePatch = '' - patchShebangs buildtools/bin/waf - ''; + wafPath = "buildtools/bin/waf"; - configureFlags = [ + wafConfigureFlags = [ "--enable-talloc-compat1" "--bundled-libraries=NONE" "--builtin-libraries=replace" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--cross-compile" - "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ]; - configurePlatforms = []; + + # this must not be exported before the ConfigurePhase otherwise waf whines + preBuild = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + export NIX_CFLAGS_LINK="-no-pie -shared"; + ''; postInstall = '' ${stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc_[0-9]*.o |