Fixing the nixpkgs tarball, broken for more than a week.
svn path=/nixpkgs/trunk/; revision=26856
This commit is contained in:
parent
be47ac0d25
commit
e4351e6df0
@ -11,7 +11,7 @@
|
|||||||
enableOfficialBranding ? false
|
enableOfficialBranding ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert stdenv.gcc ? libc;
|
assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
|
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
{stdenv, fetchurl, guile, texinfo}:
|
{stdenv, fetchurl, guile, texinfo}:
|
||||||
|
|
||||||
|
assert stdenv ? gcc && stdenv.gcc ? gcc && stdenv.gcc.gcc != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "guile-lib-0.2.0";
|
name = "guile-lib-0.2.0";
|
||||||
|
|
||||||
|
@ -6315,7 +6315,7 @@ let
|
|||||||
icecat4Xul =
|
icecat4Xul =
|
||||||
(symlinkJoin "icecat-with-xulrunner-${icecat4.version}"
|
(symlinkJoin "icecat-with-xulrunner-${icecat4.version}"
|
||||||
[ icecat4 icecatXulrunner4 ])
|
[ icecat4 icecatXulrunner4 ])
|
||||||
// { inherit (icecat4) gtk isFirefox4Like meta; };
|
// { inherit (icecat4) gtk meta; };
|
||||||
|
|
||||||
icecat4Wrapper = wrapFirefox icecat4Xul "icecat" "";
|
icecat4Wrapper = wrapFirefox icecat4Xul "icecat" "";
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user