From 967fb8ef7b073c936ac248b59bd784aab96f751c Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 24 Oct 2023 13:16:31 -0300 Subject: [PATCH 1/2] cov-build: 7.0.2 -> 2022.12.2 --- .../tools/analysis/cov-build/default.nix | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/analysis/cov-build/default.nix b/pkgs/development/tools/analysis/cov-build/default.nix index 93a4ffab388d..044c203f0aad 100644 --- a/pkgs/development/tools/analysis/cov-build/default.nix +++ b/pkgs/development/tools/analysis/cov-build/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile }: +{ lib, stdenv, fetchurl }: let message = '' @@ -8,23 +8,25 @@ let in stdenv.mkDerivation rec { pname = "cov-build"; - version = "7.0.2"; + version = "2022.12.2"; src = if stdenv.hostPlatform.system == "i686-linux" - then requireFile { - name = "cov-analysis-linux32-${version}.tar.gz"; - sha256 = "0i06wbd7blgx9adh9w09by4i18vwmldfp9ix97a5dph2cjymsviy"; - inherit message; + then fetchurl { + url = "https://archive.org/download/cov-analysis-linux-${version}.tar/cov-analysis-linux-${version}.tar.gz"; + hash = "sha256-Jr9bMUo9GRp+dgoAPqKxaTqWYWh4djGArdG9ukUK+ZY="; } - else requireFile { - name = "cov-analysis-linux64-${version}.tar.gz"; - sha256 = "0iby75p0g8gv7b501xav47milr8m9781h0hcgm1ch6x3qj6irqd8"; - inherit message; - }; + else if stdenv.hostPlatform.system == "x86_64-linux" + then fetchurl { + url = "https://archive.org/download/cov-analysis-linux64-${version}.tar/cov-analysis-linux64-${version}.tar.gz"; + hash = "sha256-CyNKILJXlDMOCXbZZF4r/knz0orRx32oSj+Kpq/nxXQ="; + } + else throw "Unsupported platform '${stdenv.hostPlatform.system}'"; + + dontConfigure = true; + + dontBuild = true; - dontStrip = true; - buildPhase = false; installPhase = '' mkdir -p $out/bin $out/libexec mv * $out/libexec @@ -38,6 +40,8 @@ stdenv.mkDerivation rec { done ''; + dontStrip = true; + meta = { description = "Coverity Scan build tools"; homepage = "https://scan.coverity.com"; From 3759827bdfb888f708a50d2cf81881952e3f5223 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 24 Oct 2023 17:21:59 +0000 Subject: [PATCH 2/2] cov-build: use autoPatchelfHook --- .../tools/analysis/cov-build/default.nix | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/analysis/cov-build/default.nix b/pkgs/development/tools/analysis/cov-build/default.nix index 044c203f0aad..61c8dda2e6da 100644 --- a/pkgs/development/tools/analysis/cov-build/default.nix +++ b/pkgs/development/tools/analysis/cov-build/default.nix @@ -1,11 +1,16 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl + +, autoPatchelfHook + +, alsa-lib +, libxcrypt-legacy +, lttng-ust_2_12 +, xorg +, zlib +}: -let - message = '' - Register an account at https://scan.coverity.com, download the - build tools, and add it to the nix store with nix-prefetch-url - ''; -in stdenv.mkDerivation rec { pname = "cov-build"; version = "2022.12.2"; @@ -23,6 +28,18 @@ stdenv.mkDerivation rec { } else throw "Unsupported platform '${stdenv.hostPlatform.system}'"; + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ + alsa-lib + libxcrypt-legacy + lttng-ust_2_12 + xorg.libXext + xorg.libXrender + xorg.libXtst + zlib + ]; + dontConfigure = true; dontBuild = true;