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

svn merge ^/nixpkgs/trunk

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
This commit is contained in:
Yury G. Kudryashov
2012-03-01 07:04:39 +00:00
parent b14a737a4d 57b612cb05
commit 0210e20b5a
74 changed files with 833 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/lyx/default.nix
+3 -3
View File
@@ -1,6 +1,6 @@
# I haven't put much effort into this expressions .. so some optional depencencies may be missing - Marc
{ fetchurl, stdenv, texLive, python, makeWrapper
, libX11, qt, xz
{ fetchurl, stdenv, texLive, python, makeWrapper, pkgconfig
, libX11, qt
}:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "a790951d6ed660b254e82d682b478665f119dd522ab4759fdeb5cd8d42f66f61";
};
buildInputs = [texLive qt python makeWrapper ];
buildInputs = [texLive qt python makeWrapper pkgconfig ];
# don't ask me why it can't find libX11.so.6
postInstall = ''