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

Merge branch 'master' into closure-size

Browse Source 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
This commit is contained in:
Vladimír Čunát
2015-12-31 09:47:26 +01:00
parent bbcf127c7c 468f698f60
commit f9f6f41bff
951 changed files with 117997 additions and 19014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/graphics/gnuplot/default.nix
View File

@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, zlib, gd, texinfo4, makeWrapper, readline
, withTeXLive ? false, texLive
, withTeXLive ? false, texlive
, withLua ? false, lua
, emacs ? null
, libX11 ? null
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ zlib gd texinfo4 readline pango cairo pkgconfig makeWrapper ]
++ lib.optional withTeXLive texLive
++ lib.optional withTeXLive (texlive.combine { inherit (texlive) scheme-small; })
++ lib.optional withLua lua
++ lib.optionals withX [ libX11 libXpm libXt libXaw ]
++ lib.optional withQt [ qt ]