diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-30 17:28:41 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-30 17:28:41 +0000 |
| commit | 00004fa6daa874af4f224e1c35a54acddcc621e2 (patch) | |
| tree | 3b57f5b696e6bf7586c674dfc19f93cf1db27beb /pkgs/applications/networking | |
| parent | 5a4de2c5de00ffb8fd5428d99e2ec9ce0bdb3564 (diff) | |
* More freedesktop.org X11 modules.
* Cleaned up some packages. svn path=/nixpkgs/trunk/; revision=883
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/builder.sh | 19 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/default.nix | 6 |
2 files changed, 11 insertions, 14 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/builder.sh b/pkgs/applications/networking/browsers/firefox/builder.sh index 23a78692136f5..eed85b6e4c6ca 100644 --- a/pkgs/applications/networking/browsers/firefox/builder.sh +++ b/pkgs/applications/networking/browsers/firefox/builder.sh @@ -1,10 +1,8 @@ -buildinputs="$pkgconfig $gtk $perl $zip $libIDL" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfj $src || exit 1 -cd mozilla || exit 1 -cat > .mozconfig <<EOF +preConfigure() { + cat > .mozconfig <<EOF export MOZ_PHOENIX=1 mk_add_options MOZ_PHOENIX=1 ac_add_options --enable-crypto @@ -21,8 +19,11 @@ ac_add_options --enable-swg ac_add_options --enable-strip ac_add_options --enable-default-toolkit=gtk2 EOF -echo "ac_add_options --prefix=$out" >> .mozconfig + echo "ac_add_options --prefix=$out" >> .mozconfig +} +preConfigure=preConfigure -./configure || exit 1 -make -f client.mk build || exit 1 -make install || exit 1 + +makeFlags="-f client.mk build" + +genericBuild diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index cf435cdddd227..f02ebd95a0626 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -15,9 +15,5 @@ stdenv.mkDerivation { md5 = "cdc85152f4219bf3e3f1a8dc46e04654"; }; - pkgconfig = pkgconfig; - gtk = gtk; - perl = perl; - zip = zip; - libIDL = libIDL; + buildInputs = [pkgconfig, gtk, perl, zip, libIDL]; } |