From a661cfe9c2d9e945c5c90515390dc177f47f13c5 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 10 May 2022 15:37:22 +0100 Subject: [PATCH] oprofile: remove withGUI hasn't been supported since 2014 see 0c142c3a096d3e9ec42cc9b0ddad994fea60d135 upstream --- .../tools/profiling/oprofile/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index 08f89d482dd..3bedc45c8d1 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -1,12 +1,8 @@ { lib, stdenv, buildPackages , fetchurl, pkg-config , libbfd, popt, zlib, linuxHeaders, libiberty_static -, withGUI ? false, qt4 ? null }: -# libX11 is needed because the Qt build stuff automatically adds `-lX11'. -assert withGUI -> qt4 != null; - stdenv.mkDerivation rec { pname = "oprofile"; version = "1.4.0"; @@ -23,14 +19,12 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libbfd zlib popt linuxHeaders libiberty_static ] - ++ lib.optionals withGUI [ qt4 ]; + buildInputs = [ libbfd zlib popt linuxHeaders libiberty_static ]; configureFlags = [ - "--with-kernel=${linuxHeaders}" - "--disable-shared" # needed because only the static libbfd is available - ] - ++ lib.optional withGUI "--with-qt-dir=${qt4} --enable-gui=qt4"; + "--with-kernel=${linuxHeaders}" + "--disable-shared" # needed because only the static libbfd is available + ]; meta = { description = "System-wide profiler for Linux";