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

treewide: explicitly specify gtk version

Browse Source
This commit is contained in:
Kirill Boltaev
2016-09-13 20:42:55 +03:00
parent 4b55b0358a
commit 0f37287df5
19 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/kernel/perf.nix
View File

@@ -1,11 +1,11 @@
{ lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto
, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils
, libiberty
, zlib, withGtk ? false, gtk ? null }:
, zlib, withGtk ? false, gtk2 ? null }:
with lib;
assert withGtk -> gtk != null;
assert withGtk -> gtk2 != null;
assert versionAtLeast kernel.version "3.12";
stdenv.mkDerivation {
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt
flex bison libiberty ];
buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils zlib ] ++
stdenv.lib.optional withGtk gtk;
stdenv.lib.optional withGtk gtk2;
# Note: we don't add elfutils to buildInputs, since it provides a
# bad `ld' and other stuff.