diff options
| author | Robin Gloster <mail@glob.in> | 2016-01-17 23:04:40 +0000 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-18 10:45:31 +0100 |
| commit | 53b389327e34de319dc0dbda2b6bcab1a69db69d (patch) | |
| tree | 04dece6a1e346ccb4563f61ec206cf03dc46e77f /pkgs/applications/science/astronomy | |
| parent | 620c147ccee09d7d068fa21b2b5b94b6695993a5 (diff) | |
| download | nixlib-53b389327e34de319dc0dbda2b6bcab1a69db69d.tar nixlib-53b389327e34de319dc0dbda2b6bcab1a69db69d.tar.gz nixlib-53b389327e34de319dc0dbda2b6bcab1a69db69d.tar.bz2 nixlib-53b389327e34de319dc0dbda2b6bcab1a69db69d.tar.lz nixlib-53b389327e34de319dc0dbda2b6bcab1a69db69d.tar.xz nixlib-53b389327e34de319dc0dbda2b6bcab1a69db69d.tar.zst nixlib-53b389327e34de319dc0dbda2b6bcab1a69db69d.zip | |
refactor to use autoreconfHook where possible
Close #12446.
Diffstat (limited to 'pkgs/applications/science/astronomy')
| -rw-r--r-- | pkgs/applications/science/astronomy/celestia/default.nix | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index d4da5c113c99..86b0ffbcf24c 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -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; |