From 7bf77e413d848c863a13950dfa1ef2d54d08aedf Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 3 Mar 2014 15:08:56 +1100 Subject: [PATCH 1/7] lesstif: fix build on Darwin * x11 = xlibsWrapper on non-Darwin systems, but is darwinX11AndOpenGL on Darwin systems, so pass in xlibsWrapper to the lesstif build instead --- pkgs/development/libraries/lesstif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix index 21b4eac30af3..8d01c2f2f438 100644 --- a/pkgs/development/libraries/lesstif/default.nix +++ b/pkgs/development/libraries/lesstif/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, libXp, libXau}: +{stdenv, fetchurl, xlibsWrapper, libXp, libXau}: stdenv.mkDerivation { name = "lesstif-0.95.0-p2"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = mirror://sourceforge/lesstif/lesstif-0.95.0.tar.bz2; md5 = "ab895165c149d7f95843c7584b1c7ad4"; }; - buildInputs = [x11]; + buildInputs = [xlibsWrapper]; propagatedBuildInputs = [libXp libXau]; # The last stable release of lesstif was in June 2006. These From ff4ec6d5f06edf07daf9e9df07f5131b7dd4795a Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 3 Mar 2014 15:10:37 +1100 Subject: [PATCH 2/7] t1lib: fix build on Darwin * x11 = xlibsWrapper on non-Darwin systems, but is darwinX11AndOpenGL on Darwin systems, so pass in xlibsWrapper to the t1lib build instead --- pkgs/development/libraries/t1lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 9a4ba00e1d33..ebd8699dc17c 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, libXaw, libXpm}: +{stdenv, fetchurl, xlibsWrapper, libXaw, libXpm}: stdenv.mkDerivation { name = "t1lib-5.1.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2"; }; - buildInputs = [x11 libXaw libXpm]; + buildInputs = [xlibsWrapper libXaw libXpm]; buildFlags = "without_doc"; } From de6792a4604a7e74bda29a57d35417a11b2b52ae Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 3 Mar 2014 15:11:51 +1100 Subject: [PATCH 3/7] graphite2: enable build on Darwin This builds on Darwin without any modifications, so it has been added to the platforms array --- pkgs/development/libraries/silgraphite/graphite2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index f6aa7c35f394..f874804c0010 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "An advanced font engine"; maintainers = [ stdenv.lib.maintainers.raskin ]; - hydraPlatforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.unix; }; } From a577082e5e9765e72b40e559f48b256e7944bb1f Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 3 Mar 2014 16:31:22 +1100 Subject: [PATCH 4/7] re-enable au debian mirror --- pkgs/build-support/fetchurl/mirrors.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index c6c294d55042..c4841c50d94c 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -159,7 +159,7 @@ rec { # Debian. debian = [ - #ftp://ftp.au.debian.org/debian/ + ftp://ftp.au.debian.org/debian/ ftp://ftp.de.debian.org/debian/ ftp://ftp.es.debian.org/debian/ ftp://ftp.fr.debian.org/debian/ From 13979ab58cb8e45f48722aa71ec6363fc7c9b444 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 3 Mar 2014 16:31:44 +1100 Subject: [PATCH 5/7] upgrade texlive-extra to 2013.20140215 The old version (2013.20131112) was no longer available on the debian mirrors, hence building from source was impossible. --- pkgs/tools/typesetting/tex/texlive/extra.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index c6624e469e5d..056c7e0bf4e0 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -1,9 +1,11 @@ args: with args; rec { - name = "texlive-extra-2013"; + name = "texlive-extra-2013"; + version = "2013.20140215"; + src = fetchurl { - url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2013.20131219.orig.tar.xz; - sha256 = "09iijzq0y5kq16f3lv2jrln190ldbbzywpwr33hrmnw5yp3izmrh"; + url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz"; + sha256 = "04a67pns6q8kw1nl2v6x5p443kvhk8fr26qkcj7z098n68fpwls8"; }; buildInputs = [texLive xz]; From 30da7690985c8deac78c72c7acf982d28872440e Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 3 Mar 2014 16:33:12 +1100 Subject: [PATCH 6/7] upgrade texlive-base, texlive-lang Upgraded to 2013.20140215. The old version (2013.20131112) was no longer available on the debian FTP server, so building from source was impossible. --- pkgs/tools/typesetting/tex/texlive/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 3158f2859334..8fab16de6746 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -5,14 +5,16 @@ rec { sha256 = "1idgyim6r4bi3id245k616qrdarfh65xv3gi2psarqqmsw504yhd"; }; + texmfVersion = "2013.20140215"; texmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-base/texlive-base_2013.20140123.orig.tar.xz; - sha256 = "1lwvqryfykz0d9pcjkhq1qh7dlcb6lsvjp7fizl18ji6166159iw"; + url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz"; + sha256 = "0f1xqa1a1yklsiqz12rgihdc6viw8ghdbx2s2pw2k3h0dfsd6ss3"; }; + langTexmfVersion = "2013.20140215"; langTexmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2013.20140123.orig.tar.xz; - sha256 = "1smzkg31msn9ci7fc69xq5klhxab00z8bcxmz5daqzcal8ak3d2d"; + url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz"; + sha256 = "0igz9kpd1rfbq7smb1wyd75cz396rinbh25rk19lxqh25dix0xzj"; }; passthru = { inherit texmfSrc langTexmfSrc; }; From f0680440191f3dcd774d9f2a1971defc2b139e64 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 3 Mar 2014 16:34:53 +1100 Subject: [PATCH 7/7] texLiveFull: fix build on Darwin Added --with-system-icu=no, --with-system-harfbuzz=no (looks like the omission of --with-system-icu was not sufficient to force the builder not to look for system ICU libs). Disable building bibtex-x: complains about missing ICU directory. Disable building dvisvgm: a test fails (and I can't work out how to prevent the tests from running just for this). Disable building devnag: failing tests. --- .../tools/typesetting/tex/texlive/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 8fab16de6746..98a8a0fd810f 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -45,7 +45,7 @@ rec { NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout"; - ./Build --prefix="$out" --datadir="$out/share" --mandir "$out/share/man" --infodir "$out/share/info" \ + ./Build --prefix="$out" --datadir="$out/share" --mandir="$out/share/man" --infodir="$out/share/info" \ ${args.lib.concatStringsSep " " configureFlags} cd Work '' ) [ "minInit" "doUnpack" "addInputs" "defEnsureDir" ]; @@ -116,14 +116,22 @@ rec { configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt" "--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib" - "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" - "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" - ] - ++ ( if stdenv.isDarwin - # ironically, couldn't get xetex compiling on darwin - then [ "--disable-xetex" "--disable-xdv2pdf" "--disable-xdvipdfmx" ] - # couldn't seem to get system icu working on darwin - else [ "--with-system-icu" ] ); + "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" + "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + # Complains about a missing ICU directory + "--disable-bibtex-x" + + # TODO: We should be able to fix these tests + "--disable-devnag" + "--disable-dvisvgm" + "--disable-xdv2pdf" + "--disable-xdvipdfmx" + "--disable-xetex" + + "--with-system-harfbuzz=no" + "--with-system-icu=no" + ]; phaseNames = [ "addInputs" "doMainBuild" "doMakeInstall" "doPostInstall" ];