public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OProfile: Add dependency on zlib. 

svn path=/nixpkgs/branches/stdenv-updates/; revision=24925
This commit is contained in:
Ludovic Courtès 2010-11-29 17:42:50 +00:00
parent ab419e9f86
commit 0d122e7c6f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/profiling/oprofile/default.nix
View File

@ -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 }: , qt ? null, libX11 ? null, libXext ? null, libpng ? null }:
# libX11 is needed because the Qt build stuff automatically adds `-lX11'. # libX11 is needed because the Qt build stuff automatically adds `-lX11'.
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
s|^PATH=.*$||g" 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 ]; ++ stdenv.lib.optionals (qt != null) [ qt libX11 libXext libpng ];
configureFlags = configureFlags =

2
pkgs/top-level/all-packages.nix
View File

@ -2507,7 +2507,7 @@ let
openocd = callPackage ../development/tools/misc/openocd { }; openocd = callPackage ../development/tools/misc/openocd { };
oprofile = import ../development/tools/profiling/oprofile { 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. # Optional build inputs for the (useless) GUI.
/* /*