From 0b9c88cba1a2d8b01df57fd6fdb314a36d7c8294 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 26 Sep 2011 04:48:35 +0000 Subject: [PATCH 1/7] Taking a patch from ArchLinux to fix altermime build svn path=/nixpkgs/trunk/; revision=29489 --- .../networking/altermime/altermime.patch | 48 +++++++++++++++++++ pkgs/tools/networking/altermime/default.nix | 4 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/networking/altermime/altermime.patch diff --git a/pkgs/tools/networking/altermime/altermime.patch b/pkgs/tools/networking/altermime/altermime.patch new file mode 100644 index 00000000000..00ed513cf32 --- /dev/null +++ b/pkgs/tools/networking/altermime/altermime.patch @@ -0,0 +1,48 @@ +AUR patch for fixing build + +diff -Naur altermime-0.3.10/qpe.c altermime-0.3.10-new/qpe.c +--- altermime-0.3.10/qpe.c 2008-11-16 09:45:45.000000000 +0100 ++++ altermime-0.3.10-new/qpe.c 2010-11-24 14:28:43.153334114 +0100 +@@ -97,7 +97,7 @@ + op+= strlen(paragraph);// +3; /** jump the output + =\r\n **/ + out_remaining-= (strlen(paragraph)); // Was +3, updated to fix Outlook problems + +- QPD fprintf(stdout, "Soft break (%d + %d > 76 char) for '%s'\n", current_line_length, charout_size, paragraph); ++ QPD fprintf(stdout, "Soft break (%zd + %d > 76 char) for '%s'\n", current_line_length, charout_size, paragraph); + + /** reinitialize the paragraph **/ + paragraph[0] = '\0'; +@@ -108,7 +108,7 @@ + } + + snprintf(pp, pp_remaining, "%s", charout); +- QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%d result='%s'\n", charout, charout_size, pp_remaining, paragraph); ++ QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%zd result='%s'\n", charout, charout_size, pp_remaining, paragraph); + pp += charout_size; + pp_remaining -= charout_size; + p++; +@@ -149,13 +149,13 @@ + out_size = in_size *3; + in_buffer = malloc( sizeof(char) *in_size +1); + if (in_buffer == NULL) { +- QPD fprintf(stdout,"Error allocating %d bytes for input buffer\n", in_size); ++ QPD fprintf(stdout,"Error allocating %zd bytes for input buffer\n", in_size); + return -1; + } + + out_buffer = malloc( sizeof(char) *out_size *3 +1); + if (in_buffer == NULL) { +- QPD fprintf(stdout,"Error allocating %d bytes for output buffer\n", out_size); ++ QPD fprintf(stdout,"Error allocating %zd bytes for output buffer\n", out_size); + return -1; + } + +@@ -169,7 +169,7 @@ + ** we segfault ;) **/ + *(in_buffer +in_size) = '\0'; + +- QPD fprintf(stdout,"file %s is loaded, size = %d\n", fname, in_size); ++ QPD fprintf(stdout,"file %s is loaded, size = %zd\n", fname, in_size); + + qp_encode( out_buffer, out_size, in_buffer, in_size ); + diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index 3b0de2805be..a98f307c77d 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -26,7 +26,9 @@ rec { inherit (sourceInfo) name version; inherit buildInputs; - phaseNames = ["fixTarget" "doMakeInstall"]; + patches = [./altermime.patch]; + + phaseNames = ["doPatch" "fixTarget" "doMakeInstall"]; fixTarget = a.fullDepEntry ('' sed -i Makefile -e "s@/usr/local@$out@" ensureDir "$out/bin" From a004ca1a7d7f19a7732fc12bbb0b100fb794ad1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Sep 2011 08:12:10 +0000 Subject: [PATCH 2/7] lxc: fixed build to include the SGML documentation svn path=/nixpkgs/trunk/; revision=29490 --- pkgs/tools/system/lxc/default.nix | 26 +- pkgs/tools/system/lxc/dont-run-ldconfig.patch | 24 ++ .../system/lxc/fix-documentation-build.patch | 40 +++ .../system/lxc/fix-sgml-documentation.patch | 252 ++++++++++++++++++ 4 files changed, 337 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/system/lxc/dont-run-ldconfig.patch create mode 100644 pkgs/tools/system/lxc/fix-documentation-build.patch create mode 100644 pkgs/tools/system/lxc/fix-sgml-documentation.patch diff --git a/pkgs/tools/system/lxc/default.nix b/pkgs/tools/system/lxc/default.nix index a4e44160a52..26180b84368 100644 --- a/pkgs/tools/system/lxc/default.nix +++ b/pkgs/tools/system/lxc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcap, perl }: +{ stdenv, fetchurl, libcap, perl, docbook2x, docbook_xml_dtd_45 }: let name = "lxc-0.7.5"; @@ -11,9 +11,15 @@ stdenv.mkDerivation{ sha256 = "019ec63f250c874bf7625b1f1bf555b1a6e3a947937a4fca73100abddf829b1c"; }; - buildInputs = [ libcap perl ]; + buildInputs = [ libcap perl docbook2x ]; - patchPhase = "sed -i -e 's|/sbin/ldconfig|:|' src/lxc/Makefile.in"; + patches = [ + ./dont-run-ldconfig.patch + ./fix-documentation-build.patch + ./fix-sgml-documentation.patch + ]; + + preConfigure = "export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; configureFlags = "--localstatedir=/var"; @@ -24,9 +30,19 @@ stdenv.mkDerivation{ ''; meta = { - homepage = http://lxc.sourceforge.net; - description = "lxc Linux Containers userland tools"; + homepage = "http://lxc.sourceforge.net"; + description = "lightweight virtual system mechanism"; license = stdenv.lib.licenses.lgpl21Plus; + + longDescription = '' + LXC is the userspace control package for Linux Containers, a + lightweight virtual system mechanism sometimes described as + "chroot on steroids". LXC builds up from chroot to implement + complete virtual systems, adding resource management and isolation + mechanisms to Linux’s existing process management infrastructure. + ''; + + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/tools/system/lxc/dont-run-ldconfig.patch b/pkgs/tools/system/lxc/dont-run-ldconfig.patch new file mode 100644 index 00000000000..e72ac0250f5 --- /dev/null +++ b/pkgs/tools/system/lxc/dont-run-ldconfig.patch @@ -0,0 +1,24 @@ +diff -ubr lxc-0.7.5-orig/src/lxc/Makefile.am lxc-0.7.5/src/lxc/Makefile.am +--- lxc-0.7.5-orig/src/lxc/Makefile.am 2011-07-25 00:27:10.000000000 +0200 ++++ lxc-0.7.5/src/lxc/Makefile.am 2011-09-26 09:58:03.479916848 +0200 +@@ -115,7 +115,7 @@ + + install-exec-local: install-soPROGRAMS + mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) +- /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) ++ : /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) + cd $(DESTDIR)$(libdir); \ + ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so + +diff -ubr lxc-0.7.5-orig/src/lxc/Makefile.in lxc-0.7.5/src/lxc/Makefile.in +--- lxc-0.7.5-orig/src/lxc/Makefile.in 2011-08-11 19:02:19.000000000 +0200 ++++ lxc-0.7.5/src/lxc/Makefile.in 2011-09-26 09:58:18.812685181 +0200 +@@ -1322,7 +1322,7 @@ + + install-exec-local: install-soPROGRAMS + mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) +- /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) ++ : /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) + cd $(DESTDIR)$(libdir); \ + ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so + diff --git a/pkgs/tools/system/lxc/fix-documentation-build.patch b/pkgs/tools/system/lxc/fix-documentation-build.patch new file mode 100644 index 00000000000..0189b35a33e --- /dev/null +++ b/pkgs/tools/system/lxc/fix-documentation-build.patch @@ -0,0 +1,40 @@ +diff -ubr '--exclude=*sgml*' lxc-0.7.5-orig/doc/Makefile.am lxc-0.7.5/doc/Makefile.am +--- lxc-0.7.5-orig/doc/Makefile.am 2011-02-14 09:14:07.000000000 +0100 ++++ lxc-0.7.5/doc/Makefile.am 2011-09-26 09:53:02.192817940 +0200 +@@ -30,13 +30,13 @@ + + + %.1 : %.sgml +- docbook2man -w all $< ++ docbook2man $< + + %.5 : %.sgml +- docbook2man -w all $< ++ docbook2man $< + + %.7 : %.sgml +- docbook2man -w all $< ++ docbook2man $< + + lxc-%.sgml : common_options.sgml see_also.sgml + +diff -ubr '--exclude=*sgml*' lxc-0.7.5-orig/doc/Makefile.in lxc-0.7.5/doc/Makefile.in +--- lxc-0.7.5-orig/doc/Makefile.in 2011-08-11 19:02:18.000000000 +0200 ++++ lxc-0.7.5/doc/Makefile.in 2011-09-26 09:53:13.835401448 +0200 +@@ -786,13 +786,13 @@ + + + @ENABLE_DOCBOOK_TRUE@%.1 : %.sgml +-@ENABLE_DOCBOOK_TRUE@ docbook2man -w all $< ++@ENABLE_DOCBOOK_TRUE@ docbook2man $< + + @ENABLE_DOCBOOK_TRUE@%.5 : %.sgml +-@ENABLE_DOCBOOK_TRUE@ docbook2man -w all $< ++@ENABLE_DOCBOOK_TRUE@ docbook2man $< + + @ENABLE_DOCBOOK_TRUE@%.7 : %.sgml +-@ENABLE_DOCBOOK_TRUE@ docbook2man -w all $< ++@ENABLE_DOCBOOK_TRUE@ docbook2man $< + + @ENABLE_DOCBOOK_TRUE@lxc-%.sgml : common_options.sgml see_also.sgml + diff --git a/pkgs/tools/system/lxc/fix-sgml-documentation.patch b/pkgs/tools/system/lxc/fix-sgml-documentation.patch new file mode 100644 index 00000000000..4d2cce0dd62 --- /dev/null +++ b/pkgs/tools/system/lxc/fix-sgml-documentation.patch @@ -0,0 +1,252 @@ +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-cgroup.sgml.in lxc-0.7.5/doc/lxc-cgroup.sgml.in +--- lxc-0.7.5-orig/doc/lxc-cgroup.sgml.in 2010-06-07 10:51:51.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-cgroup.sgml.in 2011-09-26 10:05:01.753873426 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-checkpoint.sgml.in lxc-0.7.5/doc/lxc-checkpoint.sgml.in +--- lxc-0.7.5-orig/doc/lxc-checkpoint.sgml.in 2011-02-17 10:07:44.000000000 +0100 ++++ lxc-0.7.5/doc/lxc-checkpoint.sgml.in 2011-09-26 10:05:01.753873426 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc.conf.sgml.in lxc-0.7.5/doc/lxc.conf.sgml.in +--- lxc-0.7.5-orig/doc/lxc.conf.sgml.in 2011-08-09 16:51:01.000000000 +0200 ++++ lxc-0.7.5/doc/lxc.conf.sgml.in 2011-09-26 10:05:01.754873476 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + ]> +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-console.sgml.in lxc-0.7.5/doc/lxc-console.sgml.in +--- lxc-0.7.5-orig/doc/lxc-console.sgml.in 2010-06-07 10:51:51.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-console.sgml.in 2011-09-26 10:05:01.754873476 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-create.sgml.in lxc-0.7.5/doc/lxc-create.sgml.in +--- lxc-0.7.5-orig/doc/lxc-create.sgml.in 2011-07-25 00:27:10.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-create.sgml.in 2011-09-26 10:05:01.755873526 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-destroy.sgml.in lxc-0.7.5/doc/lxc-destroy.sgml.in +--- lxc-0.7.5-orig/doc/lxc-destroy.sgml.in 2010-10-08 11:54:53.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-destroy.sgml.in 2011-09-26 10:05:01.755873526 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-execute.sgml.in lxc-0.7.5/doc/lxc-execute.sgml.in +--- lxc-0.7.5-orig/doc/lxc-execute.sgml.in 2011-07-25 00:27:10.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-execute.sgml.in 2011-09-26 10:05:01.755873526 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-freeze.sgml.in lxc-0.7.5/doc/lxc-freeze.sgml.in +--- lxc-0.7.5-orig/doc/lxc-freeze.sgml.in 2010-06-07 10:51:51.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-freeze.sgml.in 2011-09-26 10:05:01.755873526 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-kill.sgml.in lxc-0.7.5/doc/lxc-kill.sgml.in +--- lxc-0.7.5-orig/doc/lxc-kill.sgml.in 2010-10-08 11:54:53.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-kill.sgml.in 2011-09-26 10:05:01.756873576 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-ls.sgml.in lxc-0.7.5/doc/lxc-ls.sgml.in +--- lxc-0.7.5-orig/doc/lxc-ls.sgml.in 2010-06-07 10:51:51.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-ls.sgml.in 2011-09-26 10:05:01.756873576 +0200 +@@ -24,7 +24,7 @@ + + --> + +- + ]> +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-monitor.sgml.in lxc-0.7.5/doc/lxc-monitor.sgml.in +--- lxc-0.7.5-orig/doc/lxc-monitor.sgml.in 2010-06-07 10:51:51.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-monitor.sgml.in 2011-09-26 10:05:01.756873576 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-ps.sgml.in lxc-0.7.5/doc/lxc-ps.sgml.in +--- lxc-0.7.5-orig/doc/lxc-ps.sgml.in 2011-08-11 17:54:57.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-ps.sgml.in 2011-09-26 10:05:01.756873576 +0200 +@@ -24,7 +24,7 @@ + + --> + +- + ]> +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-restart.sgml.in lxc-0.7.5/doc/lxc-restart.sgml.in +--- lxc-0.7.5-orig/doc/lxc-restart.sgml.in 2011-02-17 10:07:44.000000000 +0100 ++++ lxc-0.7.5/doc/lxc-restart.sgml.in 2011-09-26 10:05:01.757873626 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc.sgml.in lxc-0.7.5/doc/lxc.sgml.in +--- lxc-0.7.5-orig/doc/lxc.sgml.in 2010-10-26 18:07:35.000000000 +0200 ++++ lxc-0.7.5/doc/lxc.sgml.in 2011-09-26 10:05:01.758873676 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + ]> +@@ -280,7 +280,7 @@ + + + +- ++ + + + +@@ -570,7 +570,7 @@ + to the background. + + +- ++ + + + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-start.sgml.in lxc-0.7.5/doc/lxc-start.sgml.in +--- lxc-0.7.5-orig/doc/lxc-start.sgml.in 2011-02-01 15:12:40.000000000 +0100 ++++ lxc-0.7.5/doc/lxc-start.sgml.in 2011-09-26 10:05:01.758873676 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-stop.sgml.in lxc-0.7.5/doc/lxc-stop.sgml.in +--- lxc-0.7.5-orig/doc/lxc-stop.sgml.in 2010-06-07 10:51:51.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-stop.sgml.in 2011-09-26 10:05:01.758873676 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-unfreeze.sgml.in lxc-0.7.5/doc/lxc-unfreeze.sgml.in +--- lxc-0.7.5-orig/doc/lxc-unfreeze.sgml.in 2010-06-07 10:51:51.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-unfreeze.sgml.in 2011-09-26 10:05:01.759873726 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-wait.sgml.in lxc-0.7.5/doc/lxc-wait.sgml.in +--- lxc-0.7.5-orig/doc/lxc-wait.sgml.in 2010-06-07 10:51:51.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-wait.sgml.in 2011-09-26 10:05:01.759873726 +0200 +@@ -24,7 +24,7 @@ + + --> + +- + From 01022a1502b22b2bac3967ec026d9b4704345409 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Sep 2011 08:12:14 +0000 Subject: [PATCH 3/7] lxc: moved package into the "applications/virtualization" category svn path=/nixpkgs/trunk/; revision=29491 --- .../system => applications/virtualization}/lxc/default.nix | 0 .../virtualization}/lxc/dont-run-ldconfig.patch | 0 .../virtualization}/lxc/fix-documentation-build.patch | 0 .../virtualization}/lxc/fix-sgml-documentation.patch | 0 pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{tools/system => applications/virtualization}/lxc/default.nix (100%) rename pkgs/{tools/system => applications/virtualization}/lxc/dont-run-ldconfig.patch (100%) rename pkgs/{tools/system => applications/virtualization}/lxc/fix-documentation-build.patch (100%) rename pkgs/{tools/system => applications/virtualization}/lxc/fix-sgml-documentation.patch (100%) diff --git a/pkgs/tools/system/lxc/default.nix b/pkgs/applications/virtualization/lxc/default.nix similarity index 100% rename from pkgs/tools/system/lxc/default.nix rename to pkgs/applications/virtualization/lxc/default.nix diff --git a/pkgs/tools/system/lxc/dont-run-ldconfig.patch b/pkgs/applications/virtualization/lxc/dont-run-ldconfig.patch similarity index 100% rename from pkgs/tools/system/lxc/dont-run-ldconfig.patch rename to pkgs/applications/virtualization/lxc/dont-run-ldconfig.patch diff --git a/pkgs/tools/system/lxc/fix-documentation-build.patch b/pkgs/applications/virtualization/lxc/fix-documentation-build.patch similarity index 100% rename from pkgs/tools/system/lxc/fix-documentation-build.patch rename to pkgs/applications/virtualization/lxc/fix-documentation-build.patch diff --git a/pkgs/tools/system/lxc/fix-sgml-documentation.patch b/pkgs/applications/virtualization/lxc/fix-sgml-documentation.patch similarity index 100% rename from pkgs/tools/system/lxc/fix-sgml-documentation.patch rename to pkgs/applications/virtualization/lxc/fix-sgml-documentation.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01637aac38d..85ec80c9c65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -915,7 +915,7 @@ let lshw = callPackage ../tools/system/lshw { }; - lxc = callPackage ../tools/system/lxc { }; + lxc = callPackage ../applications/virtualization/lxc { }; lzma = xz; From 201fab68410e72cd89c7b93a600da0d147e30440 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Sep 2011 08:12:18 +0000 Subject: [PATCH 4/7] all-packages.nix: strip trailing whitespace svn path=/nixpkgs/trunk/; revision=29492 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85ec80c9c65..98d38c8d14b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -446,7 +446,7 @@ let gui = true; }; - bittornado = callPackage ../tools/networking/p2p/bit-tornado { + bittornado = callPackage ../tools/networking/p2p/bit-tornado { inherit (pythonPackages) ssl; }; From b7d32054da2ee65e7b111284e12cfc6dfa049a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Sep 2011 12:07:21 +0000 Subject: [PATCH 5/7] GNU Automake: Add TODO. svn path=/nixpkgs/trunk/; revision=29494 --- pkgs/development/tools/misc/automake/automake-1.11.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index ca04293e345..148d0a600eb 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -3,6 +3,9 @@ stdenv.mkDerivation rec { name = "automake-1.11.1"; + # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is + # available upstream; see + # . builder = ./builder.sh; setupHook = ./setup-hook.sh; From e8a30536b6019aa4e5c72262d2ddf1a8fb0b9d98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Sep 2011 12:07:24 +0000 Subject: [PATCH 6/7] Cairo: Add dependency on Gettext on non-GNU systems; build it. svn path=/nixpkgs/trunk/; revision=29495 --- pkgs/development/libraries/cairo/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 62e907264d5..ca3e53e64f4 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -5,6 +5,7 @@ , gobjectSupport ? true, glib , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs , zlib, libpng, pixman, libxcb ? null, xcbutil ? null +, gettext }: assert postscriptSupport -> zlib != null; @@ -22,7 +23,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig x11 fontconfig pixman xlibs.libXrender ] ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] - ++ stdenv.lib.optional gobjectSupport glib; + ++ stdenv.lib.optional gobjectSupport glib + + # On non-GNU systems we need GNU Gettext for libintl. + ++ stdenv.lib.optional (!stdenv.isLinux) gettext; propagatedBuildInputs = [ freetype ] ++ @@ -62,5 +66,7 @@ stdenv.mkDerivation rec { homepage = http://cairographics.org/; licenses = [ "LGPLv2+" "MPLv1" ]; + + platforms = stdenv.lib.platforms.all; }; } From 5da4cd69fc527e0f8355b78394d55d150b513640 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 26 Sep 2011 13:13:45 +0000 Subject: [PATCH 7/7] imlib2-1.4.5 svn path=/nixpkgs/trunk/; revision=29496 --- pkgs/development/libraries/imlib2/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index d5c5424c077..83adb16bbc8 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,12 +1,18 @@ { stdenv, fetchurl, x11, libjpeg, libtiff, libungif, libpng, bzip2, pkgconfig }: -stdenv.mkDerivation { - name = "imlib2-1.4.4"; +stdenv.mkDerivation rec { + name = "imlib2-1.4.5"; src = fetchurl { - url = mirror://sourceforge/enlightenment/imlib2-1.4.4.tar.gz; - sha256 = "163162aifak8ya17brzqwjlr8ywz40s2s3573js5blcc1g4m5pm4"; + url = "mirror://sourceforge/enlightenment/${name}.tar.bz2"; + sha256 = "0nllbhf8vfwdm40z35yj27n83k2mjf5vbd62khad4f0qjf9hsw14"; }; - buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 pkgconfig ]; + buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 ]; + + buildNativeInputs = [ pkgconfig ]; + + meta = { + platforms = stdenv.lib.platforms.gnu; # random choice + }; }