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/tools/security/aflplusplus | |
| 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/tools/security/aflplusplus')
| -rw-r--r-- | nixpkgs/pkgs/tools/security/aflplusplus/default.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/tools/security/aflplusplus/qemu.nix | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/tools/security/aflplusplus/default.nix b/nixpkgs/pkgs/tools/security/aflplusplus/default.nix index 6102eb0b3f39..a63f80c68ad1 100644 --- a/nixpkgs/pkgs/tools/security/aflplusplus/default.nix +++ b/nixpkgs/pkgs/tools/security/aflplusplus/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, stdenvNoCC, fetchFromGitHub, callPackage, makeWrapper , clang, llvm, gcc, which, libcgroup, python3, perl, gmp -, file, wine ? null, fetchpatch +, file, wine ? null , cmocka , llvmPackages }: @@ -11,7 +11,7 @@ assert (wine != null) -> (stdenv.targetPlatform.system == "i686-linux"); let - aflplusplus-qemu = callPackage ./qemu.nix { inherit aflplusplus; }; + aflplusplus-qemu = callPackage ./qemu.nix { }; qemu-exe-name = if stdenv.targetPlatform.system == "x86_64-linux" then "qemu-x86_64" else if stdenv.targetPlatform.system == "i686-linux" then "qemu-i386" else throw "aflplusplus: no support for ${stdenv.targetPlatform.system}!"; diff --git a/nixpkgs/pkgs/tools/security/aflplusplus/qemu.nix b/nixpkgs/pkgs/tools/security/aflplusplus/qemu.nix index 6be5afb54dc3..89e537766ddb 100644 --- a/nixpkgs/pkgs/tools/security/aflplusplus/qemu.nix +++ b/nixpkgs/pkgs/tools/security/aflplusplus/qemu.nix @@ -1,7 +1,5 @@ { lib , stdenv -, fetchurl -, aflplusplus , python3 , zlib , pkg-config @@ -19,10 +17,6 @@ let qemuName = "qemu-5.2.50"; - cpuTarget = - if stdenv.targetPlatform.system == "x86_64-linux" then "x86_64-linux-user" - else if stdenv.targetPlatform.system == "i686-linux" then "i386-linux-user" - else throw "aflplusplus: no support for ${stdenv.targetPlatform.system}!"; in stdenv.mkDerivation { name = "aflplusplus-${qemuName}"; |