From 46f338d55deee4b20ecd4327847592a2c54ad7dc Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 18 Dec 2013 13:33:12 +0200 Subject: [PATCH] aalib: update builder --- pkgs/development/libraries/aalib/builder.sh | 5 ----- pkgs/development/libraries/aalib/default.nix | 7 ++++--- 2 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 pkgs/development/libraries/aalib/builder.sh diff --git a/pkgs/development/libraries/aalib/builder.sh b/pkgs/development/libraries/aalib/builder.sh deleted file mode 100644 index 5d4df565a6da..000000000000 --- a/pkgs/development/libraries/aalib/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -source $stdenv/setup - -configureFlags="--without-x --with-ncurses=$ncurses" - -genericBuild diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index a2c968ceb029..fa21a9570c7a 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "aalib-1.4rc5"; - builder = ./builder.sh; + src = fetchurl { url = mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz; sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv"; @@ -13,8 +13,9 @@ stdenv.mkDerivation { cp ${automake}/share/automake*/config.{sub,guess} . ''; - buildInputs = [ncurses]; - inherit ncurses; + buildInputs = [ ncurses ]; + + configureFlags = "--without-x --with-ncurses=${ncurses}"; meta = { description = "ASCII art graphics library";