From 85ee8e90b7ad893c047efbe9a88e5f7b83729bcd Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 9 Nov 2009 14:43:01 +0000 Subject: [PATCH] make static sdf2bundle svn path=/nixpkgs/trunk/; revision=18312 --- pkgs/development/compilers/strategoxt/0.18.nix | 17 ++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/strategoxt/0.18.nix b/pkgs/development/compilers/strategoxt/0.18.nix index 393b6ae1bcb..2cce7d32152 100644 --- a/pkgs/development/compilers/strategoxt/0.18.nix +++ b/pkgs/development/compilers/strategoxt/0.18.nix @@ -1,14 +1,21 @@ -{stdenv, fetchurl, aterm, pkgconfig, getopt, jdk}: +{stdenv, fetchurl, aterm, pkgconfig, getopt, jdk, makeStaticBinaries}: rec { inherit aterm; - sdfStatic = stdenv.mkDerivation ( rec { - name = "${sdf.name}-static"; - configureFlags = "--enable-shared=no --enable-static=yes"; + stdenvStatic = makeStaticBinaries stdenv ; - inherit (sdf) src buildInputs preConfigure meta; + atermStatic = stdenvStatic.mkDerivation ( rec { + name = "${aterm.name}-static"; + inherit (aterm) src meta patches; + } // ( if stdenv.system == "i686-cygwin" then { inherit (sdf) CFLAGS; } else {} ) ) ; + + + sdfStatic = stdenvStatic.mkDerivation ( rec { + name = "${sdf.name}-static"; + inherit (sdf) src preConfigure meta; + buildInputs = [pkgconfig atermStatic]; } // ( if stdenv.system == "i686-cygwin" then { inherit (sdf) CFLAGS; } else {} ) ) ; sdf = stdenv.mkDerivation ( rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efbca313e52..828acee4f86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2231,7 +2231,7 @@ let }; strategoPackages018 = import ../development/compilers/strategoxt/0.18.nix { - inherit fetchurl stdenv pkgconfig aterm getopt jdk; + inherit fetchurl stdenv pkgconfig aterm getopt jdk makeStaticBinaries; }; metaBuildEnv = import ../development/compilers/meta-environment/meta-build-env {