diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-04-22 03:27:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-22 03:27:36 +0200 |
commit | 2df2e5f330a015c2f3c807441e41c334f00f09e6 (patch) | |
tree | d5670b8e197b6a64c7c222869f9f4be023faf9d9 /pkgs/development/libraries | |
parent | 3eb8f4d15c6b3fbb0170045df40b43cfd07d5d10 (diff) | |
parent | 80651c123ee99f36f478e4248024a0e53ac7ada7 (diff) |
Merge pull request #118269 from midchildan/feat/fuse/add-darwin
Diffstat (limited to 'pkgs/development/libraries')
4 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index b89683ac0539b..94970c5a308a3 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, zlib, curl, expat, fuse, openssl -, autoreconfHook, python3 +, autoreconfHook, python3, libiconv }: stdenv.mkDerivation rec { @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib curl expat openssl python3 ] - ++ lib.optionals stdenv.isLinux [ fuse ]; + ++ lib.optionals (with stdenv; isLinux || isDarwin) [ fuse ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; meta = { homepage = "http://afflib.sourceforge.net/"; diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index b7c9287b68bc8..b81afc24ee984 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -31,7 +31,15 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://savannah.nongnu.org/projects/attr/"; description = "Library and tools for manipulating extended attributes"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl2Plus; + + # The build failure on Darwin will likely be solved after upgrading the + # macOS SDK in nixpkgs. Check the current SDK version in + # ../../../../os-specific/darwin/apple-sdk/default.nix to see if it has + # been updated to 10.13 or later. Once the requirements are met, building + # it should be straightforward as Homebrew was able to build it without + # patching. + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/libraries/libspectrum/default.nix b/pkgs/development/libraries/libspectrum/default.nix index 011531b1a23e9..09aa03e6f67fc 100644 --- a/pkgs/development/libraries/libspectrum/default.nix +++ b/pkgs/development/libraries/libspectrum/default.nix @@ -13,12 +13,13 @@ stdenv.mkDerivation rec { buildInputs = [ audiofile bzip2 glib libgcrypt zlib ]; enableParallelBuilding = true; + doCheck = true; meta = with lib; { homepage = "http://fuse-emulator.sourceforge.net/libspectrum.php"; description = "ZX Spectrum input and output support library"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index d17303bbb0efe..90c14c6fdf95f 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -41,7 +41,6 @@ in stdenv.mkDerivation { description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; maintainers = [ maintainers.phreedom ]; - broken = stdenv.isDarwin; platforms = platforms.unix; }; } |