refactor to use autoreconfHook where possible

Close #12446.
This commit is contained in:
Robin Gloster
2016-01-17 23:04:40 +00:00
committed by Vladimír Čunát
parent 620c147cce
commit 53b389327e
50 changed files with 188 additions and 320 deletions

View File

@@ -1,17 +1,19 @@
{ stdenv, fetchurl, perl, gettext, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11
, pkgconfig, gtk, SDL, autoconf, automake, makeDesktopItem
{ stdenv, fetchurl, perl, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11
, pkgconfig, gtk, SDL, autoreconfHook, makeDesktopItem
}:
stdenv.mkDerivation rec {
name = "vice-2.2";
src = fetchurl {
url = http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.2.tar.gz;
sha256 = "0l8mp9ybx494fdqgr1ps4x3c3qzms4yyg4hzcn3ihzy92zw1nn2x";
};
buildInputs = [ perl gettext libpng giflib libjpeg alsaLib readline mesa
pkgconfig gtk SDL autoconf automake ];
buildInputs = [ perl libpng giflib libjpeg alsaLib readline mesa
pkgconfig gtk SDL autoreconfHook ];
configureFlags = "--with-sdl --enable-fullscreen --enable-gnomeui";
desktopItem = makeDesktopItem {
name = "vice";
exec = "x64";
@@ -23,18 +25,16 @@ stdenv.mkDerivation rec {
patchPhase = ''
# Disable font-cache update
sed -i -e "s|install: install-data-am|install-no: install-data-am|" data/fonts/Makefile.am
autoreconf -f -i
'';
NIX_LDFLAGS = "-lX11 -L${libX11}/lib";
postInstall = ''
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
'';
meta = {
description = "Commodore 64, 128 and other emulators";
homepage = http://www.viceteam.org;

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchgit, pkgconfig, autoconf, automake
{ stdenv, fetchgit, pkgconfig, autoreconfHook
, libX11, pam, libgcrypt, libXrender, imlib2 }:
stdenv.mkDerivation rec {
@@ -11,7 +11,6 @@ stdenv.mkDerivation rec {
sha256 = "c1f00bf90c966b2b76e00061cc4b54a3c0bc6547e788731ab694b43f55a216ab";
};
preConfigure = "autoreconf -fvi";
configureFlags = [
"--enable-pam"
"--enable-hash"
@@ -19,7 +18,7 @@ stdenv.mkDerivation rec {
"--enable-imlib2"
];
buildInputs = [
pkgconfig autoconf automake libX11
pkgconfig autoreconfHook libX11
pam libgcrypt libXrender imlib2
];