nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

gst_all_1.gstreamer: use a better libunwind check (#339006)

Browse Source
This commit is contained in:
Emily 2024-09-03 15:08:02 +01:00 committed by GitHub
commit b4aa6a4f57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/gstreamer/core/default.nix
View File

@ -21,8 +21,9 @@
, buildPackages , buildPackages
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
, libunwind , libunwind
# darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it. , withLibunwind ?
, withLibunwind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform libunwind lib.meta.availableOn stdenv.hostPlatform libunwind &&
lib.elem "libunwind" libunwind.meta.pkgConfigModules or []
# Checks meson.is_cross_build(), so even canExecute isn't enough. # Checks meson.is_cross_build(), so even canExecute isn't enough.
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
}: }:

17
pkgs/development/libraries/libunwind/default.nix
View File

@ -1,13 +1,16 @@
{ stdenv, lib, fetchpatch, fetchFromGitHub, autoreconfHook, xz, buildPackages }: { stdenv, lib, fetchpatch, fetchFromGitHub, autoreconfHook, buildPackages
, xz
, testers
}:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "libunwind"; pname = "libunwind";
version = "1.8.1"; version = "1.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libunwind"; owner = "libunwind";
repo = "libunwind"; repo = "libunwind";
rev = "v${version}"; rev = "v${finalAttrs.version}";
hash = "sha256-rCFBHs6rCSnp5FEwbUR5veNNTqSQpFblAv8ebSPX0qE="; hash = "sha256-rCFBHs6rCSnp5FEwbUR5veNNTqSQpFblAv8ebSPX0qE=";
}; };
@ -50,12 +53,18 @@ stdenv.mkDerivation rec {
doCheck = false; # fails doCheck = false; # fails
passthru.tests.pkg-config = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;
versionCheck = true;
};
meta = with lib; { meta = with lib; {
homepage = "https://www.nongnu.org/libunwind"; homepage = "https://www.nongnu.org/libunwind";
description = "Portable and efficient API to determine the call-chain of a program"; description = "Portable and efficient API to determine the call-chain of a program";
maintainers = with maintainers; [ orivej ]; maintainers = with maintainers; [ orivej ];
pkgConfigModules = [ "libunwind" "libunwind-coredump" "libunwind-generic" "libunwind-ptrace" "libunwind-setjmp" ];
# https://github.com/libunwind/libunwind#libunwind # https://github.com/libunwind/libunwind#libunwind
platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd" "i686-linux" "loongarch64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "s390x-linux" "x86_64-freebsd" "x86_64-linux" "x86_64-solaris" ]; platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd" "i686-linux" "loongarch64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "s390x-linux" "x86_64-freebsd" "x86_64-linux" "x86_64-solaris" ];
license = licenses.mit; license = licenses.mit;
}; };
} })