From 0d122e7c6fe73bb61287c545fcfaba4e2b6285ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 29 Nov 2010 17:42:50 +0000 Subject: [PATCH] OProfile: Add dependency on zlib. svn path=/nixpkgs/branches/stdenv-updates/; revision=24925 --- pkgs/development/tools/profiling/oprofile/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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. /*