diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-16 12:01:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-16 12:01:10 +0000 |
| commit | 6be56bfc2e9b55bab869132f31bd74b07f837ac7 (patch) | |
| tree | e41785833e5847e2a7ff2ac46f10208375b62138 /pkgs/development/libraries | |
| parent | 83e19bd62ee767a9003088013c8ba61dd7211f95 (diff) | |
| parent | faad370edcb37162401be50d45526f52bb16a713 (diff) | |
| download | nixpkgs-6be56bfc2e9b55bab869132f31bd74b07f837ac7.tar nixpkgs-6be56bfc2e9b55bab869132f31bd74b07f837ac7.tar.gz nixpkgs-6be56bfc2e9b55bab869132f31bd74b07f837ac7.tar.bz2 nixpkgs-6be56bfc2e9b55bab869132f31bd74b07f837ac7.tar.lz nixpkgs-6be56bfc2e9b55bab869132f31bd74b07f837ac7.tar.xz nixpkgs-6be56bfc2e9b55bab869132f31bd74b07f837ac7.tar.zst nixpkgs-6be56bfc2e9b55bab869132f31bd74b07f837ac7.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/wasilibc/default.nix | 33 |
2 files changed, 20 insertions, 15 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 2f7d0943dd4..9732fcb663d 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -82,7 +82,7 @@ let meta = let meta = args.meta or {}; in meta // { - homepage = meta.homepage or "http://www.kde.org"; + homepage = meta.homepage or "https://kde.org"; license = meta.license or license; maintainers = (meta.maintainers or []) ++ maintainers; platforms = meta.platforms or lib.platforms.linux; diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index e8436f9e956..9448041c5e7 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation { pname = "wasilibc"; - version = "unstable-2021-09-23"; + version = "unstable-2022-04-12"; src = buildPackages.fetchFromGitHub { owner = "WebAssembly"; repo = "wasi-libc"; - rev = "ad5133410f66b93a2381db5b542aad5e0964db96"; - hash = "sha256-RiIClVXrb18jF9qCt+5iALHPCZKYcnad7JsILHBV0pA="; + rev = "a279514a6ef30cd8ee1469345b33172fcbc8d52d"; + sha256 = "0a9ldas8p7jg7jlkhb9wdiw141z7vfz6p18mnmxnnnna7bp1y3fz"; fetchSubmodules = true; }; + outputs = [ "out" "dev" "share" ]; + # clang-13: error: argument unused during compilation: '-rtlib=compiler-rt' [-Werror,-Wunused-command-line-argument] postPatch = '' substituteInPlace Makefile \ @@ -19,21 +21,24 @@ stdenv.mkDerivation { ''; preBuild = '' - export NIX_CFLAGS_COMPILE="-I$(pwd)/sysroot/include $NIX_CFLAGS_COMPILE" + export SYSROOT_LIB=${builtins.placeholder "out"}/lib + export SYSROOT_INC=${builtins.placeholder "dev"}/include + export SYSROOT_SHARE=${builtins.placeholder "share"}/share + mkdir -p "$SYSROOT_LIB" "$SYSROOT_INC" "$SYSROOT_SHARE" + makeFlagsArray+=( + "SYSROOT_LIB:=$SYSROOT_LIB" + "SYSROOT_INC:=$SYSROOT_INC" + "SYSROOT_SHARE:=$SYSROOT_SHARE" + ) ''; - makeFlags = [ - "WASM_CC=${stdenv.cc.targetPrefix}cc" - "WASM_NM=${stdenv.cc.targetPrefix}nm" - "WASM_AR=${stdenv.cc.targetPrefix}ar" - "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 + # We just build right into the install paths, per the `preBuild`. + dontInstall = true; + + preFixup = '' + ln -s $share/share/undefined-symbols.txt $out/lib/wasi.imports ''; meta = with lib; { |