diff options
| author | Will Dietz <w@wdtz.org> | 2018-03-24 14:00:08 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-03-25 18:08:05 -0500 |
| commit | 47dc9d7b35e1dfb308ea7285e583cf276bbc0ee1 (patch) | |
| tree | 8756615a26ec09f8b3ba7a4ef9adf4303ffffd42 /pkgs/development/libraries/ti-rpc | |
| parent | d6ffaac4ace8d9427a9618d2f2d08a14cf3861c6 (diff) | |
| download | nixpkgs-47dc9d7b35e1dfb308ea7285e583cf276bbc0ee1.tar nixpkgs-47dc9d7b35e1dfb308ea7285e583cf276bbc0ee1.tar.gz nixpkgs-47dc9d7b35e1dfb308ea7285e583cf276bbc0ee1.tar.bz2 nixpkgs-47dc9d7b35e1dfb308ea7285e583cf276bbc0ee1.tar.lz nixpkgs-47dc9d7b35e1dfb308ea7285e583cf276bbc0ee1.tar.xz nixpkgs-47dc9d7b35e1dfb308ea7285e583cf276bbc0ee1.tar.zst nixpkgs-47dc9d7b35e1dfb308ea7285e583cf276bbc0ee1.zip | |
tirpc: remove upstreamed patch, fix w/musl
Diffstat (limited to 'pkgs/development/libraries/ti-rpc')
| -rw-r--r-- | pkgs/development/libraries/ti-rpc/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index aa134d35104..99f0bb65441 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -8,14 +8,12 @@ stdenv.mkDerivation rec { sha256 = "0ppxl3k3nsz0qdakq844i2kj4fvh9h937lhx26bgmpmxq67sghw6"; }; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl - (fetchpatch { - url = "https://raw.githubusercontent.com/openembedded/openembedded-core/2be873301420ec6ca2c70d899b7c49a7e2b0954d/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch"; - sha256 = "1jmbn0j2bnjp0j9z5vzz5xiwyv3kd28w5pixbqsy2lz6q8nii7cf"; - }); - postPatch = '' sed '1i#include <stdint.h>' -i src/xdr_sizeof.c + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace tirpc/rpc/types.h \ + --replace '#if defined __APPLE_CC__ || defined __FreeBSD__' \ + '#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined __GLIBC__' ''; nativeBuildInputs = [ autoreconfHook ]; |