diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-05-07 19:11:18 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-05-07 19:36:34 +0100 |
| commit | c7577fa1c3aab76f20c5798948f9448c33cb3ae6 (patch) | |
| tree | eb5e668299550ae54c7c69dd67358c221bd649c8 /pkgs/development/libraries/mbedtls | |
| parent | 015ee2acedaf6b09321d82a15c4f21f08c327516 (diff) | |
| download | nixpkgs-c7577fa1c3aab76f20c5798948f9448c33cb3ae6.tar nixpkgs-c7577fa1c3aab76f20c5798948f9448c33cb3ae6.tar.gz nixpkgs-c7577fa1c3aab76f20c5798948f9448c33cb3ae6.tar.bz2 nixpkgs-c7577fa1c3aab76f20c5798948f9448c33cb3ae6.tar.lz nixpkgs-c7577fa1c3aab76f20c5798948f9448c33cb3ae6.tar.xz nixpkgs-c7577fa1c3aab76f20c5798948f9448c33cb3ae6.tar.zst nixpkgs-c7577fa1c3aab76f20c5798948f9448c33cb3ae6.zip | |
mbedtls: remove darwin patch
Diffstat (limited to 'pkgs/development/libraries/mbedtls')
| -rw-r--r-- | pkgs/development/libraries/mbedtls/darwin_dylib.patch | 28 | ||||
| -rw-r--r-- | pkgs/development/libraries/mbedtls/default.nix | 22 |
2 files changed, 11 insertions, 39 deletions
diff --git a/pkgs/development/libraries/mbedtls/darwin_dylib.patch b/pkgs/development/libraries/mbedtls/darwin_dylib.patch deleted file mode 100644 index bc6992d6e77..00000000000 --- a/pkgs/development/libraries/mbedtls/darwin_dylib.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/library/Makefile b/library/Makefile -index 28f9231..ad9cc32 100644 ---- a/library/Makefile -+++ b/library/Makefile -@@ -103,9 +103,9 @@ libmbedtls.so: libmbedtls.$(SOEXT_TLS) - echo " LN $@ -> $<" - ln -sf $< $@ - --libmbedtls.dylib: $(OBJS_TLS) -+libmbedtls.dylib: $(OBJS_TLS) libmbedx509.dylib - echo " LD $@" -- $(CC) -dynamiclib $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_TLS) -+ $(CC) -dynamiclib -L. -lmbedcrypto -lmbedx509 $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_TLS) - - libmbedtls.dll: $(OBJS_TLS) libmbedx509.dll - echo " LD $@" -@@ -126,9 +126,9 @@ libmbedx509.so: libmbedx509.$(SOEXT_X509) - echo " LN $@ -> $<" - ln -sf $< $@ - --libmbedx509.dylib: $(OBJS_X509) -+libmbedx509.dylib: $(OBJS_X509) libmbedcrypto.dylib - echo " LD $@" -- $(CC) -dynamiclib $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_X509) -+ $(CC) -dynamiclib -L. -lmbedcrypto $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_X509) - - libmbedx509.dll: $(OBJS_X509) libmbedcrypto.dll - echo " LD $@" diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index bd10824bfa1..74be133b068 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin_dylib.patch ]; - postPatch = '' patchShebangs . '' + stdenv.lib.optionalString stdenv.isDarwin '' @@ -34,15 +32,17 @@ stdenv.mkDerivation rec { ]; postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedtls.dylib - install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedx509.dylib - install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $out/lib/libmbedtls.dylib - - for exe in $out/bin/*; do - install_name_tool -change libmbedtls.dylib $out/lib/libmbedtls.dylib $exe - install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $exe - install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $exe - done + install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedtls.dylib + install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedx509.dylib + install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $out/lib/libmbedtls.dylib + + for exe in $out/bin/*; do + if [[ $exe != *.sh ]]; then + install_name_tool -change libmbedtls.dylib $out/lib/libmbedtls.dylib $exe + install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $exe + install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $exe + fi + done ''; doCheck = true; |