diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
| commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
| tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/libraries/capstone | |
| parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
| parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
| download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/capstone')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/capstone/default.nix | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/development/libraries/capstone/default.nix b/nixpkgs/pkgs/development/libraries/capstone/default.nix index a2ace544b7c9..ff33c7bd0979 100644 --- a/nixpkgs/pkgs/development/libraries/capstone/default.nix +++ b/nixpkgs/pkgs/development/libraries/capstone/default.nix @@ -1,7 +1,7 @@ { lib , stdenv +, cmake , fetchFromGitHub -, pkg-config , fixDarwinDylibNames }: @@ -16,31 +16,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-XMwQ7UaPC8YYu4yxsE4bbR3leYPfBHu5iixSLz05r3g="; }; - # replace faulty macos detection - postPatch = lib.optionalString stdenv.isDarwin '' - sed -i 's/^IS_APPLE := .*$/IS_APPLE := 1/' Makefile - ''; - - configurePhase = "patchShebangs make.sh "; - buildPhase = "PREFIX=$out ./make.sh"; - - doCheck = true; - checkPhase = '' - # first remove fuzzing steps from check target - substituteInPlace Makefile --replace "fuzztest fuzzallcorp" "" - make check - ''; - - installPhase = (lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ") - + "PREFIX=$out ./make.sh install"; - nativeBuildInputs = [ - pkg-config + cmake ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; - enableParallelBuilding = true; + doCheck = true; meta = { description = "Advanced disassembly library"; |