diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index 3e49c73e853..143704126f4 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, binutils, popt, makeWrapper, gawk, which, gnugrep +{ stdenv, fetchurl, binutils, popt, makeWrapper, gawk, which, gnugrep, zlib , qt ? null, libX11 ? null, libXext ? null, libpng ? null }: # libX11 is needed because the Qt build stuff automatically adds `-lX11'. @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { s|^PATH=.*$||g" ''; - buildInputs = [ binutils popt makeWrapper gawk which gnugrep ] + buildInputs = [ binutils zlib popt makeWrapper gawk which gnugrep ] ++ stdenv.lib.optionals (qt != null) [ qt libX11 libXext libpng ]; configureFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7e939ff939..1e0c9e1353f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2507,7 +2507,7 @@ let openocd = callPackage ../development/tools/misc/openocd { }; oprofile = import ../development/tools/profiling/oprofile { - inherit fetchurl stdenv binutils popt makeWrapper gawk which gnugrep; + inherit fetchurl stdenv binutils popt makeWrapper gawk which gnugrep zlib; # Optional build inputs for the (useless) GUI. /*