MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

OProfile: Add dependency on zlib.

Browse source 
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 }:
# 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 =

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

@ -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.
/*