diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-08-22 13:47:37 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-08-22 18:22:22 +0000 |
commit | 1b9a13c4689af7e088eb7af5589f8c811282846a (patch) | |
tree | 3ed032953008280fb94ef894c869ff3e2a2f7865 /nixpkgs/pkgs/development/libraries/pth | |
parent | 4999a38db7c5de0ea9f514a12ecd4133cce647f3 (diff) | |
parent | 1412af4b2cfae71d447164097d960d426e9752c0 (diff) | |
download | nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.gz nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.bz2 nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.lz nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.xz nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.zst nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.zip |
Merge remote-tracking branch 'channels/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/pth')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/pth/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/pth/default.nix b/nixpkgs/pkgs/development/libraries/pth/default.nix index c315cb8f72b4..b2173ec21ee1 100644 --- a/nixpkgs/pkgs/development/libraries/pth/default.nix +++ b/nixpkgs/pkgs/development/libraries/pth/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { preConfigure = stdenv.lib.optionalString stdenv.isAarch32 '' configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") + '' + stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' + configureFlagsArray+=("ac_cv_check_sjlj=ssjlj") ''; meta = with stdenv.lib; { @@ -17,6 +19,5 @@ stdenv.mkDerivation rec { homepage = https://www.gnu.org/software/pth; license = licenses.lgpl21Plus; platforms = platforms.all; - broken = stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isAarch64; }; } |