nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-13 09:13:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #235210: dtc: fix build issues in Darwin

Browse Source 
...into staging-next
This commit is contained in:
Vladimír Čunát 2023-06-03 14:58:43 +02:00
commit e74dab4d35
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/development/compilers/dtc/default.nix
View File

@ -31,23 +31,23 @@ stdenv.mkDerivation rec {
sha256 = "sha256-C7OzwY0zq+2CV3SB5unI7Ill2M3deF7FXeQE3B/Kx2s=";
})
# meson.build: bump version to 1.7.0
(fetchpatch {
url = "https://github.com/dgibson/dtc/commit/64a907f08b9bedd89833c1eee674148cff2343c6.patch";
sha256 = "sha256-p2KGS5GW+3uIPgXfuIx6aDC54csM+5FZDkK03t58AL8=";
})
# Fix version in libfdt/meson.build
(fetchpatch {
url = "https://github.com/dgibson/dtc/commit/723545ebe9933b90ea58dc125e4987c6bcb04ade.patch";
sha256 = "sha256-5Oq7q+62ZObj3e7rguN9jhSpYoQkwjSfo/N893229dQ=";
})
# Use #ifdef NO_VALGRIND
(fetchpatch {
url = "https://github.com/dgibson/dtc/commit/41821821101ad8a9f83746b96b163e5bcbdbe804.patch";
sha256 = "sha256-7QEFDtap2DWbUGqtyT/RgJZJFldKB8oSubKiCtLZ0w4=";
})
# dtc: Fix linker options so it also works in Darwin
(fetchpatch {
url = "https://github.com/dgibson/dtc/commit/3acde70714df3623e112cf3ec99fc9b5524220b8.patch";
sha256 = "sha256-uLXL0Sjcn+bnMuF+A6PjUW1Rq6uNg1dQl58zbeYpP/U=";
})
# meson: allow disabling tests
(fetchpatch {
url = "https://github.com/dgibson/dtc/commit/35f26d2921b68d97fefbd5a2b6e821a2f02ff65d.patch";
sha256 = "sha256-cO4f/jJX/pQL7kk4jpKUhsCVESW2ZuWaTr7z3BuvVkw=";
})
];
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -69,6 +69,12 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs setup.py
# meson.build: bump version to 1.7.0
substituteInPlace libfdt/meson.build \
--replace "version: '1.6.0'," "version: '${version}',"
substituteInPlace meson.build \
--replace "version: '1.6.0'," "version: '${version}',"
'';
# Required for installation of Python library and is innocuous otherwise.
@ -77,12 +83,9 @@ stdenv.mkDerivation rec {
mesonAutoFeatures = "auto";
mesonFlags = [
(lib.mesonBool "static-build" stdenv.hostPlatform.isStatic)
(lib.mesonBool "tests" doCheck)
];
postFixup = lib.optionalString stdenv.isDarwin ''
install_name_tool -id $out/lib/libfdt.dylib $out/lib/libfdt-${version}.dylib
'';
# Checks are broken on aarch64 darwin
# https://github.com/NixOS/nixpkgs/pull/118700#issuecomment-885892436
doCheck = !stdenv.isDarwin;