diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-10-15 10:22:28 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-10-15 10:22:28 -0700 |
| commit | 8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36 (patch) | |
| tree | 90013bf1e284372e7de0ad6b3715dc5a0ea926d1 /pkgs/development/tools/profiling | |
| parent | 1283e3da5d0bc4657677d40fa3cb117b66489ee5 (diff) | |
| parent | 62e676b9598d2638e846761160082f6fec392ffe (diff) | |
| download | nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.gz nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.bz2 nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.lz nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.xz nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.zst nixpkgs-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/tools/profiling')
| -rw-r--r-- | pkgs/development/tools/profiling/oprofile/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index 561fea6ef7b..01e8152ea96 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig +{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig, linuxHeaders , withGUI ? false , qt4 ? null}: # libX11 is needed because the Qt build stuff automatically adds `-lX11'. assert withGUI -> qt4 != null; stdenv.mkDerivation rec { - name = "oprofile-1.0.0"; + name = "oprofile-1.1.0"; src = fetchurl { url = "mirror://sourceforge/oprofile/${name}.tar.gz"; - sha256 = "0nn4wfvwy4nii25y6lwlrnzx9ah4nz0r93yk7hswiy6wxjs10wc4"; + sha256 = "0v1nn38h227bgxjwqf22rjp2iqgjm4ls3gckzifks0x6w5nrlxfg"; }; - buildInputs = [ binutils zlib popt pkgconfig ] + buildInputs = [ binutils zlib popt pkgconfig linuxHeaders ] ++ stdenv.lib.optionals withGUI [ qt4 ]; configureFlags = [ + "--with-kernel=${linuxHeaders}" "--disable-shared" # needed because only the static libbfd is available ] ++ stdenv.lib.optional withGUI "--with-qt-dir=${qt4} --enable-gui=qt4"; |