Author: urkud
Date: Sun Apr 1 19:47:40 2012
New Revision: 33527
URL: https://nixos.org/websvn/nix/?rev=33527&sc=1
Log:
Move $out/share/gtk-doc removal to setup-hook
Added:
nixpkgs/branches/glib-2.32/pkgs/development/libraries/glib/setup-hook.sh
Modified:
nixpkgs/branches/glib-2.32/pkgs/development/libraries/atk/default.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/cairo/default.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/clutter-gtk/0.10.8.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/clutter-gtk/default.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/glib/default.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gobject-introspection/default.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gstreamer/gstreamer/default.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/2.x.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/3.x.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/librdf/raptor2.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/librdf/rasqal.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/pango/default.nix
Modified: nixpkgs/branches/glib-2.32/pkgs/development/libraries/atk/default.nix
==============================================================================
--- nixpkgs/branches/glib-2.32/pkgs/development/libraries/atk/default.nix
Sun Apr 1 19:47:34 2012 (r33526)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/atk/default.nix
Sun Apr 1 19:47:40 2012 (r33527)
@@ -12,8 +12,6 @@
propagatedBuildInputs = [ glib ];
- postInstall = "rm -rf $out/share/gtk-doc";
-
meta = {
description = "ATK, the accessibility toolkit";
Modified:
nixpkgs/branches/glib-2.32/pkgs/development/libraries/cairo/default.nix
==============================================================================
--- nixpkgs/branches/glib-2.32/pkgs/development/libraries/cairo/default.nix
Sun Apr 1 19:47:34 2012 (r33526)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/cairo/default.nix
Sun Apr 1 19:47:40 2012 (r33527)
@@ -45,9 +45,6 @@
-es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2
-I${freetype}/include|g'
'';
- # The default `--disable-gtk-doc' is ignored.
- postInstall = "rm -rf $out/share/gtk-doc";
-
meta = {
description = "A 2D graphics library with support for multiple output
devices";
Modified:
nixpkgs/branches/glib-2.32/pkgs/development/libraries/clutter-gtk/0.10.8.nix
==============================================================================
---
nixpkgs/branches/glib-2.32/pkgs/development/libraries/clutter-gtk/0.10.8.nix
Sun Apr 1 19:47:34 2012 (r33526)
+++
nixpkgs/branches/glib-2.32/pkgs/development/libraries/clutter-gtk/0.10.8.nix
Sun Apr 1 19:47:40 2012 (r33527)
@@ -11,8 +11,6 @@
propagatedBuildInputs = [ clutter gtk ];
buildNativeInputs = [ pkgconfig ];
- postBuild = "rm -rf $out/share/gtk-doc";
-
meta = {
description = "Clutter-GTK";
Modified:
nixpkgs/branches/glib-2.32/pkgs/development/libraries/clutter-gtk/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.32/pkgs/development/libraries/clutter-gtk/default.nix
Sun Apr 1 19:47:34 2012 (r33526)
+++
nixpkgs/branches/glib-2.32/pkgs/development/libraries/clutter-gtk/default.nix
Sun Apr 1 19:47:40 2012 (r33527)
@@ -11,8 +11,6 @@
propagatedBuildInputs = [ clutter gtk3 ];
buildNativeInputs = [ pkgconfig ];
- postBuild = "rm -rf $out/share/gtk-doc";
-
meta = {
description = "Clutter-GTK";
Modified: nixpkgs/branches/glib-2.32/pkgs/development/libraries/glib/default.nix
==============================================================================
--- nixpkgs/branches/glib-2.32/pkgs/development/libraries/glib/default.nix
Sun Apr 1 19:47:34 2012 (r33526)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/glib/default.nix
Sun Apr 1 19:47:40 2012 (r33527)
@@ -11,7 +11,7 @@
# Reminder: add 'sed -e 's@python2\.[0-9]@python@' -i
# $out/bin/gtester-report' to postInstall if this is solved
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
name = "glib-2.32.0";
src = fetchurl {
@@ -29,7 +29,9 @@
passthru.gioModuleDir = "lib/gio/modules";
- postInstall = ''rm -rvf $out/share/gtk-doc'';
+ preUnpack = "source ${setupHook}";
+
+ setupHook = ./setup-hook.sh;
meta = {
description = "GLib, a C library of programming buildings blocks";
Added: nixpkgs/branches/glib-2.32/pkgs/development/libraries/glib/setup-hook.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/glib/setup-hook.sh
Sun Apr 1 19:47:40 2012 (r33527)
@@ -0,0 +1,6 @@
+if [ -z "$dontRemoveGtkDocs" ]; then
+postFixup="
+$postFixup
+rm -rvf $out/share/gtk-doc
+"
+fi
Modified:
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gobject-introspection/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gobject-introspection/default.nix
Sun Apr 1 19:47:34 2012 (r33526)
+++
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gobject-introspection/default.nix
Sun Apr 1 19:47:40 2012 (r33527)
@@ -20,8 +20,6 @@
sha256 =
"5b1387ff37f03db880a2b1cbd6c6b6dfb923a29468d4d8367c458abf7704c61e";
};
- postInstall = "rm -rf $out/share/gtk-doc";
-
meta = with stdenv.lib; {
maintainers = [ maintainers.urkud ];
platforms = platforms.linux;
Modified:
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
Sun Apr 1 19:47:34 2012 (r33526)
+++
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
Sun Apr 1 19:47:40 2012 (r33527)
@@ -33,8 +33,6 @@
propagatedBuildInputs = [ gstreamer ];
- postInstall = "rm -rf $out/share/gtk-doc";
-
meta = {
homepage = http://gstreamer.freedesktop.org;
Modified:
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gstreamer/gstreamer/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gstreamer/gstreamer/default.nix
Sun Apr 1 19:47:34 2012 (r33526)
+++
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gstreamer/gstreamer/default.nix
Sun Apr 1 19:47:40 2012 (r33527)
@@ -19,12 +19,9 @@
'';
configureFlags = ''
- --disable-examples --enable-failing-tests --localstatedir=/var
--disable-gtk-doc --disable-docbook
+ --disable-examples --enable-failing-tests --localstatedir=/var
--disable-docbook
'';
- # Hm, apparently --disable-gtk-doc is ignored...
- postInstall = "rm -rf $out/share/gtk-doc";
-
setupHook = ./setup-hook.sh;
meta = {
Modified: nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/2.x.nix
==============================================================================
--- nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/2.x.nix Sun Apr
1 19:47:34 2012 (r33526)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/2.x.nix Sun Apr
1 19:47:40 2012 (r33527)
@@ -34,8 +34,6 @@
configureFlags = "--with-xinput=yes";
- postInstall = "rm -rf $out/share/gtk-doc";
-
meta = {
description = "A multi-platform toolkit for creating graphical user
interfaces";
Modified: nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/3.x.nix
==============================================================================
--- nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/3.x.nix Sun Apr
1 19:47:34 2012 (r33526)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/3.x.nix Sun Apr
1 19:47:40 2012 (r33527)
@@ -26,8 +26,6 @@
++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
++ stdenv.lib.optionals cupsSupport [ cups ];
- postInstall = "rm -rf $out/share/gtk-doc";
-
meta = {
description = "A multi-platform toolkit for creating graphical user
interfaces";
Modified:
nixpkgs/branches/glib-2.32/pkgs/development/libraries/librdf/raptor2.nix
==============================================================================
--- nixpkgs/branches/glib-2.32/pkgs/development/libraries/librdf/raptor2.nix
Sun Apr 1 19:47:34 2012 (r33526)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/librdf/raptor2.nix
Sun Apr 1 19:47:40 2012 (r33527)
@@ -10,8 +10,6 @@
buildInputs = [ libxml2 libxslt ];
- postInstall = "rm -rvf $out/share/gtk-doc";
-
meta = {
description = "The RDF Parser Toolkit";
homepage = "http://librdf.org/raptor";;
Modified:
nixpkgs/branches/glib-2.32/pkgs/development/libraries/librdf/rasqal.nix
==============================================================================
--- nixpkgs/branches/glib-2.32/pkgs/development/libraries/librdf/rasqal.nix
Sun Apr 1 19:47:34 2012 (r33526)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/librdf/rasqal.nix
Sun Apr 1 19:47:40 2012 (r33527)
@@ -14,8 +14,6 @@
propagatedBuildInputs = [ librdf_raptor2 ];
- postInstall = "rm -rvf $out/share/gtk-doc";
-
meta = {
description = "Library that handles Resource Description Framework (RDF)";
homepage = "http://librdf.org/rasqal";;
Modified:
nixpkgs/branches/glib-2.32/pkgs/development/libraries/pango/default.nix
==============================================================================
--- nixpkgs/branches/glib-2.32/pkgs/development/libraries/pango/default.nix
Sun Apr 1 19:47:34 2012 (r33526)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/pango/default.nix
Sun Apr 1 19:47:40 2012 (r33527)
@@ -14,8 +14,6 @@
propagatedBuildInputs = [ x11 glib cairo libpng ];
- postInstall = "rm -rf $out/share/gtk-doc";
-
meta = {
description = "A library for laying out and rendering of text, with an
emphasis on internationalization";
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
