diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-11-29 17:42:50 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-11-29 17:42:50 +0000 |
| commit | 0d122e7c6fe73bb61287c545fcfaba4e2b6285ca (patch) | |
| tree | 9c8361ddd2707cebdde26c7bd4695ced4e3e7150 /pkgs | |
| parent | ab419e9f86c78f02c4ddc04f4586c20a25dcb53d (diff) | |
| download | nixlib-0d122e7c6fe73bb61287c545fcfaba4e2b6285ca.tar nixlib-0d122e7c6fe73bb61287c545fcfaba4e2b6285ca.tar.gz nixlib-0d122e7c6fe73bb61287c545fcfaba4e2b6285ca.tar.bz2 nixlib-0d122e7c6fe73bb61287c545fcfaba4e2b6285ca.tar.lz nixlib-0d122e7c6fe73bb61287c545fcfaba4e2b6285ca.tar.xz nixlib-0d122e7c6fe73bb61287c545fcfaba4e2b6285ca.tar.zst nixlib-0d122e7c6fe73bb61287c545fcfaba4e2b6285ca.zip | |
OProfile: Add dependency on zlib.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24925
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/profiling/oprofile/default.nix | 4 | ||||
| -rw-r--r-- | 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 3e49c73e853b..143704126f44 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 f7e939ff939b..1e0c9e1353f6 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. /* |