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

refactor to use autoreconfHook where possible

Browse Source 
Close #12446.
This commit is contained in:
Robin Gloster
2016-01-18 10:45:31 +01:00
committed by Vladimír Čunát
parent 620c147cce
commit 53b389327e
50 changed files with 188 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/astronomy/celestia/default.nix
+9 -12
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu
, lua, mesa, pkgconfig, perl, automake, autoconf, libtool, gettext, glib, cairo
, lua, mesa, pkgconfig, perl, autoreconfHook, glib, cairo
, pango, gdk_pixbuf, atk
}:
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
};
buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa pkgconfig lua
perl automake autoconf libtool gettext ];
perl autoreconfHook ];
patchPhase = ''
patch -Np0 -i "${gcc46Patch}"
@@ -53,18 +53,15 @@ stdenv.mkDerivation {
patch -Np2 -i "${libpng16Patch}"
patch -Np1 -i "${linkingPatch}"
patch -Np1 -i "${gcc47Patch}"
autoreconf
configureFlagsArray=(
--with-gtk
--with-lua=${lua}
CPPFLAGS="-DNDEBUG"
CFLAGS="-O2 -fsigned-char"
CXXFLAGS="-O2 -fsigned-char"
GTK_CFLAGS="-I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${gdk_pixbuf}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include"
GTK_LIBS="-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0"
)
'';
configureFlags = "--with-gtk --with-lua=${lua}";
CPPFLAGS = "-DNDEBUG";
CFLAGS = "-O2 -fsigned-char";
CXXFLAGS = "-O2 -fsigned-char";
GTK_CFLAGS = "-I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${gdk_pixbuf}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include";
GTK_LIBS = "-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0";
installPhase = ''make MKDIR_P="mkdir -p" install'';
enableParallelBuilding = true;