diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-30 00:51:00 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-30 00:51:00 +0200 |
| commit | 6843fc41c9e6d95ebb99e04df4b508ac459349c0 (patch) | |
| tree | 5adf525fae74eeaf0c4e1af0e6df76e0ec11d820 /pkgs | |
| parent | 250c7682e1c971b4c265ed181ad6857549947157 (diff) | |
| download | nixlib-6843fc41c9e6d95ebb99e04df4b508ac459349c0.tar nixlib-6843fc41c9e6d95ebb99e04df4b508ac459349c0.tar.gz nixlib-6843fc41c9e6d95ebb99e04df4b508ac459349c0.tar.bz2 nixlib-6843fc41c9e6d95ebb99e04df4b508ac459349c0.tar.lz nixlib-6843fc41c9e6d95ebb99e04df4b508ac459349c0.tar.xz nixlib-6843fc41c9e6d95ebb99e04df4b508ac459349c0.tar.zst nixlib-6843fc41c9e6d95ebb99e04df4b508ac459349c0.zip | |
Fix evaluation
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/v8/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/ccache/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/spring/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/text/sgml/opensp/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
5 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index fda32a7ddbd3..3abac0feab38 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Google's open source JavaScript engine"; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; linux; license = licenses.bsd3; }; } diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 3dd634274f3e..7207767a896d 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, runCommand, gcc, zlib}: +assert stdenv.isLinux; + let ccache = stdenv.mkDerivation { diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 69387f0cfd3a..bc00dfd8765a 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { postInstall = '' 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; { @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { description = "A powerful real-time strategy (RTS) game engine"; license = licenses.gpl2; maintainers = [ maintainers.phreedom maintainers.qknight maintainers.iElectric ]; - platforms = platforms.mesaPlatforms; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index 78c964dac1ea..4b807718baae 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -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 { name = "opensp-1.5.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { docsrc/*.xml ''; - configureFlags = optional stdenv.isDarwin [ + configureFlags = lib.optional stdenv.isDarwin [ "--with-libintl-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 ''; - buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a546bb0e1d8f..5bc61e004c77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2732,7 +2732,8 @@ let libc = glibc; binutils = binutils; shell = bash; - inherit libcxx coreutils zlib; + inherit coreutils zlib; + extraPackages = [ libcxx ]; nativeTools = false; nativeLibc = false; }; @@ -2772,6 +2773,8 @@ let gcc = gcc48; gcc_multi = gcc48_multi; + gccApple = throw "gccApple is no longer supported"; + gcc33 = wrapGCC (import ../development/compilers/gcc/3.3 { inherit fetchurl stdenv noSysDirs; }); |