From 0e1a6872331d7895e9dc19965b1485837a0eb95b Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 9 Nov 2009 15:05:45 +0000 Subject: [PATCH] revert previous change svn path=/nixpkgs/trunk/; revision=18314 --- pkgs/development/compilers/strategoxt/0.18.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/strategoxt/0.18.nix b/pkgs/development/compilers/strategoxt/0.18.nix index aad5e070ca9..78e8e1f09c6 100644 --- a/pkgs/development/compilers/strategoxt/0.18.nix +++ b/pkgs/development/compilers/strategoxt/0.18.nix @@ -4,20 +4,18 @@ rec { inherit aterm; - stdenvStatic = makeStaticBinaries stdenv ; - - atermStatic = stdenvStatic.mkDerivation ( rec { + atermStatic = stdenv.mkDerivation ( rec { name = "${aterm.name}-static"; + configureFlags = "--enable-shared=no --enable-static=yes"; + inherit (aterm) src meta patches; - configureFlags = "--enable-static=yes"; } // ( if stdenv.system == "i686-cygwin" then { inherit (sdf) CFLAGS; } else {} ) ) ; - - - sdfStatic = stdenvStatic.mkDerivation ( rec { + + sdfStatic = stdenv.mkDerivation ( rec { name = "${sdf.name}-static"; - inherit (sdf) src preConfigure meta; - buildInputs = [pkgconfig atermStatic]; - configureFlags = "--enable-static=yes"; + configureFlags = "--enable-shared=no --enable-static=yes"; + + inherit (sdf) src buildInputs preConfigure meta; } // ( if stdenv.system == "i686-cygwin" then { inherit (sdf) CFLAGS; } else {} ) ) ; sdf = stdenv.mkDerivation ( rec {