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

Merge pull request #13840 from ttuegel/closure-size-darwin

Browse Source 
Fix evaluation errors on Darwin
This commit is contained in:
Thomas Tuegel 2016-03-11 13:17:16 -06:00
commit 55b6c17926
6 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/search/recoll/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
substituteInPlace $f --replace egrep ${gnugrep}/bin/egrep substituteInPlace $f --replace egrep ${gnugrep}/bin/egrep
substituteInPlace $f --replace groff ${groff}/bin/groff substituteInPlace $f --replace groff ${groff}/bin/groff
substituteInPlace $f --replace gunzip ${gzip}/bin/gunzip substituteInPlace $f --replace gunzip ${gzip}/bin/gunzip
substituteInPlace $f --replace iconv ${libiconv.bin}/bin/iconv substituteInPlace $f --replace iconv ${libiconv.bin or libiconv}/bin/iconv
substituteInPlace $f --replace lyx ${lyx}/bin/lyx substituteInPlace $f --replace lyx ${lyx}/bin/lyx
substituteInPlace $f --replace pdftotext ${poppler_utils.out}/bin/pdftotext substituteInPlace $f --replace pdftotext ${poppler_utils.out}/bin/pdftotext
substituteInPlace $f --replace pstotext ${ghostscript}/bin/ps2ascii substituteInPlace $f --replace pstotext ${ghostscript}/bin/ps2ascii

2
pkgs/development/compilers/ghc/6.10.2-binary.nix
View File

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
'' else ""); '' else "");
configurePhase = '' configurePhase = ''
./configure --prefix=$out --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev}/include ./configure --prefix=$out --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev or gmp}/include
''; '';
# Stripping combined with patchelf breaks the executables (they die # Stripping combined with patchelf breaks the executables (they die

2
pkgs/development/libraries/qt-4.x/4.8/default.nix
View File

@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
./libressl.patch ./libressl.patch
(substituteAll { (substituteAll {
src = ./dlopen-absolute-paths.diff; src = ./dlopen-absolute-paths.diff;
cups = cups.out; cups = if cups != null then cups.out else null;
icu = icu.out; icu = icu.out;
libXfixes = libXfixes.out; libXfixes = libXfixes.out;
glibc = stdenv.cc.libc.out; glibc = stdenv.cc.libc.out;

3
pkgs/os-specific/linux/module-init-tools/default.nix
View File

@ -1,5 +1,7 @@
{ stdenv, fetchurl, docbook2x, docbook_sgml_dtd_41 }: { stdenv, fetchurl, docbook2x, docbook_sgml_dtd_41 }:
assert (stdenv.lib.elem stdenv.system stdenv.lib.platforms.linux);
stdenv.mkDerivation { stdenv.mkDerivation {
name = "module-init-tools-3.16"; name = "module-init-tools-3.16";
@ -31,5 +33,6 @@ stdenv.mkDerivation {
meta = { meta = {
homepage = http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/; homepage = http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/;
description = "Tools for loading and managing Linux kernel modules"; description = "Tools for loading and managing Linux kernel modules";
platforms = stdenv.lib.platforms.linux;
}; };
} }

2
pkgs/stdenv/darwin/make-bootstrap-tools.nix
View File

@ -62,7 +62,7 @@ rec {
cp -d ${openssl.out}/lib/*.dylib $out/lib cp -d ${openssl.out}/lib/*.dylib $out/lib
cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib
cp -d ${libiconv.lib}/lib/lib*.dylib $out/lib cp -d ${libiconv.lib or libiconv}/lib/lib*.dylib $out/lib
cp -d ${gettext}/lib/libintl*.dylib $out/lib cp -d ${gettext}/lib/libintl*.dylib $out/lib
chmod +x $out/lib/libintl*.dylib chmod +x $out/lib/libintl*.dylib
cp -d ${ncurses.lib}/lib/libncurses*.dylib $out/lib cp -d ${ncurses.lib}/lib/libncurses*.dylib $out/lib

2
pkgs/tools/networking/ppp/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
[ ( substituteAll { [ ( substituteAll {
src = ./nix-purity.patch; src = ./nix-purity.patch;
inherit libpcap; inherit libpcap;
glibc = stdenv.cc.libc.dev; glibc = stdenv.cc.libc.dev or stdenv.cc.libc;
}) })
# Without nonpriv.patch, pppd --version doesn't work when not run as # Without nonpriv.patch, pppd --version doesn't work when not run as
# root. # root.