Update Vacuum
svn path=/nixpkgs/trunk/; revision=28948
This commit is contained in:
parent
7a0fe943aa
commit
cd68b91a4f
@ -1,6 +1,7 @@
|
|||||||
x@{builderDefsPackage
|
x@{builderDefsPackage
|
||||||
, qt4, openssl
|
, qt4, openssl
|
||||||
, xproto, libX11, libXScrnSaver, scrnsaverproto
|
, xproto, libX11, libXScrnSaver, scrnsaverproto
|
||||||
|
, xz
|
||||||
, ...}:
|
, ...}:
|
||||||
builderDefsPackage
|
builderDefsPackage
|
||||||
(a :
|
(a :
|
||||||
@ -11,11 +12,11 @@ let
|
|||||||
buildInputs = map (n: builtins.getAttr n x)
|
buildInputs = map (n: builtins.getAttr n x)
|
||||||
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
||||||
sourceInfo = rec {
|
sourceInfo = rec {
|
||||||
version="1.1.0";
|
version="1.1.1";
|
||||||
baseName="vacuum";
|
baseName="vacuum-im";
|
||||||
name="${baseName}-${version}";
|
name="${baseName}-${version}";
|
||||||
url="http://vacuum-im.googlecode.com/files/${name}.tar.gz";
|
url="http://vacuum-im.googlecode.com/files/${name}.tar.xz";
|
||||||
hash="c956b0cf5cc0a1acee47a96f0b0e7ab5d716e48cac4a7fcbca496f901a219dcc";
|
hash="b4b3472bf83173f6be1bbe69520bf6cab97e24cf9fd8a7b60e4ffdc1cb43b1dc";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
@ -28,7 +29,7 @@ rec {
|
|||||||
inherit buildInputs;
|
inherit buildInputs;
|
||||||
|
|
||||||
/* doConfigure should be removed if not needed */
|
/* doConfigure should be removed if not needed */
|
||||||
phaseNames = ["preBuild" "doQMake" "doMakeInstall"];
|
phaseNames = ["addInputs" "preBuild" "doQMake" "doMakeInstall"];
|
||||||
|
|
||||||
preBuild = a.fullDepEntry (''
|
preBuild = a.fullDepEntry (''
|
||||||
echo "Fixing a name collision with a function added in Qt 4.7"
|
echo "Fixing a name collision with a function added in Qt 4.7"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user