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

Fix evaluation

Browse Source
This commit is contained in:
Eelco Dolstra 2014-09-30 00:51:00 +02:00
parent 250c7682e1
commit 6843fc41c9
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/v8/default.nix
View File

@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Google's open source JavaScript engine"; description = "Google's open source JavaScript engine";
platforms = with platforms; linux ++ darwin; platforms = with platforms; linux;
license = licenses.bsd3; license = licenses.bsd3;
}; };
} }

2
pkgs/development/tools/misc/ccache/default.nix
View File

@ -1,5 +1,7 @@
{stdenv, fetchurl, runCommand, gcc, zlib}: {stdenv, fetchurl, runCommand, gcc, zlib}:
assert stdenv.isLinux;
let let
ccache = ccache =
stdenv.mkDerivation { stdenv.mkDerivation {

4
pkgs/games/spring/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram "$out/bin/spring" \ wrapProgram "$out/bin/spring" \
--prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib::${systemd}/lib" --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib::${systemd}/lib"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
description = "A powerful real-time strategy (RTS) game engine"; description = "A powerful real-time strategy (RTS) game engine";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.phreedom maintainers.qknight maintainers.iElectric ]; maintainers = [ maintainers.phreedom maintainers.qknight maintainers.iElectric ];
platforms = platforms.mesaPlatforms; platforms = platforms.linux;
}; };
} }

5
pkgs/tools/text/sgml/opensp/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, libxslt, docbook_xsl}: { lib, stdenv, fetchurl, xmlto, docbook_xml_dtd_412, libxslt, docbook_xsl }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "opensp-1.5.2"; name = "opensp-1.5.2";
@ -13,7 +13,7 @@ stdenv.mkDerivation {
docsrc/*.xml docsrc/*.xml
''; '';
configureFlags = optional stdenv.isDarwin [ configureFlags = lib.optional stdenv.isDarwin [
"--with-libintl-prefix=/usr" "--with-libintl-prefix=/usr"
"--with-libiconv-prefix=/usr" "--with-libiconv-prefix=/usr"
]; ];
@ -26,7 +26,6 @@ stdenv.mkDerivation {
sed -i -e 's/name="idm.*"//g' $out/share/doc/OpenSP/releasenotes.html sed -i -e 's/name="idm.*"//g' $out/share/doc/OpenSP/releasenotes.html
''; '';
buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ]; buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ];
meta = { meta = {

5
pkgs/top-level/all-packages.nix
View File

@ -2732,7 +2732,8 @@ let
libc = glibc; libc = glibc;
binutils = binutils; binutils = binutils;
shell = bash; shell = bash;
inherit libcxx coreutils zlib; inherit coreutils zlib;
extraPackages = [ libcxx ];
nativeTools = false; nativeTools = false;
nativeLibc = false; nativeLibc = false;
}; };
@ -2772,6 +2773,8 @@ let
gcc = gcc48; gcc = gcc48;
gcc_multi = gcc48_multi; gcc_multi = gcc48_multi;
gccApple = throw "gccApple is no longer supported";
gcc33 = wrapGCC (import ../development/compilers/gcc/3.3 { gcc33 = wrapGCC (import ../development/compilers/gcc/3.3 {
inherit fetchurl stdenv noSysDirs; inherit fetchurl stdenv noSysDirs;
}); });