diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-14 12:01:26 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-14 12:01:26 +0000 |
commit | 0ed928e4aba48923f8a198c53ab445fbf8bd06c4 (patch) | |
tree | 0f86a4ebbd96dc9a60ac4bafa12c3ee115d3a90c /pkgs/development/libraries | |
parent | 0737c221adbd17c7319976b4fad8840dda2f88bd (diff) | |
parent | 1a268c42c8b0550f70da78c136171799481b0d97 (diff) | |
download | nixpkgs-0ed928e4aba48923f8a198c53ab445fbf8bd06c4.tar nixpkgs-0ed928e4aba48923f8a198c53ab445fbf8bd06c4.tar.gz nixpkgs-0ed928e4aba48923f8a198c53ab445fbf8bd06c4.tar.bz2 nixpkgs-0ed928e4aba48923f8a198c53ab445fbf8bd06c4.tar.lz nixpkgs-0ed928e4aba48923f8a198c53ab445fbf8bd06c4.tar.xz nixpkgs-0ed928e4aba48923f8a198c53ab445fbf8bd06c4.tar.zst nixpkgs-0ed928e4aba48923f8a198c53ab445fbf8bd06c4.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/t1lib/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/wasilibc/default.nix | 33 |
2 files changed, 31 insertions, 13 deletions
diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 69940c18aaf..66c9863c38a 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -21,19 +21,22 @@ stdenv.mkDerivation rec { version = "5.1.2"; src = fetchurl { - url = "mirror://metalab/libs/graphics/t1lib-${version}.tar.gz"; - sha256 = "0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2"; + url = "mirror://ibiblioPubLinux/libs/graphics/${pname}-${version}.tar.gz"; + hash = "sha256-ghMotQVPeJCg0M0vUoJScHBd82QdvUdtWNF+Vu2Ve1k="; }; inherit patches; buildInputs = [ libX11 libXaw ]; buildFlags = [ "without_doc" ]; - postInstall = lib.optionalString (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? + postInstall = lib.optionalString (!stdenv.isDarwin) '' + # ?? + chmod +x $out/lib/*.so.* + ''; meta = with lib; { - description = "A type 1 font rasterizer library for UNIX/X11"; homepage = "http://www.t1lib.org/"; + description = "A type 1 font rasterizer library for UNIX/X11"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index 56ed7367b2b..e8436f9e956 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -1,14 +1,27 @@ -{ stdenv, fetchFromGitHub, lib }: +{ stdenv, buildPackages, fetchFromGitHub, lib }: stdenv.mkDerivation { pname = "wasilibc"; - version = "20190712"; - src = fetchFromGitHub { - owner = "CraneStation"; + version = "unstable-2021-09-23"; + + src = buildPackages.fetchFromGitHub { + owner = "WebAssembly"; repo = "wasi-libc"; - rev = "8df0d4cd6a559b58d4a34b738a5a766b567448cf"; - sha256 = "1n4gvgzacpagar2mx8g9950q0brnhwz7jg2q44sa5mnjmlnkiqhh"; + rev = "ad5133410f66b93a2381db5b542aad5e0964db96"; + hash = "sha256-RiIClVXrb18jF9qCt+5iALHPCZKYcnad7JsILHBV0pA="; + fetchSubmodules = true; }; + + # clang-13: error: argument unused during compilation: '-rtlib=compiler-rt' [-Werror,-Wunused-command-line-argument] + postPatch = '' + substituteInPlace Makefile \ + --replace "-Werror" "" + ''; + + preBuild = '' + export NIX_CFLAGS_COMPILE="-I$(pwd)/sysroot/include $NIX_CFLAGS_COMPILE" + ''; + makeFlags = [ "WASM_CC=${stdenv.cc.targetPrefix}cc" "WASM_NM=${stdenv.cc.targetPrefix}nm" @@ -16,6 +29,8 @@ stdenv.mkDerivation { "INSTALL_DIR=${placeholder "out"}" ]; + enableParallelBuilding = true; + postInstall = '' mv $out/lib/*/* $out/lib ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports @@ -23,9 +38,9 @@ stdenv.mkDerivation { meta = with lib; { description = "WASI libc implementation for WebAssembly"; - homepage = "https://wasi.dev"; - platforms = platforms.wasi; - maintainers = [ maintainers.matthewbauer ]; + homepage = "https://wasi.dev"; + platforms = platforms.wasi; + maintainers = with maintainers; [ matthewbauer ]; license = with licenses; [ asl20 mit llvm-exception ]; }; } |