From bf1db9d2abafa283b9e273728eb4e064b0bbd73e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 9 Mar 2005 19:08:21 +0000 Subject: * Set the MOZILLA_FIVE_HOME variable to point to Firefox so that MonoDevelop can browse web pages. (Maybe this shouldn't be done in MonoDevelop but in a higher-level wrapper.) svn path=/nixpkgs/trunk/; revision=2360 --- pkgs/applications/editors/monodevelop/builder.sh | 6 +++++- pkgs/applications/editors/monodevelop/default.nix | 4 +++- pkgs/system/all-packages-generic.nix | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/monodevelop/builder.sh b/pkgs/applications/editors/monodevelop/builder.sh index bd4b282c7c4..eb42bc54f4c 100644 --- a/pkgs/applications/editors/monodevelop/builder.sh +++ b/pkgs/applications/editors/monodevelop/builder.sh @@ -10,16 +10,20 @@ postInstall() { mv $out/bin $out/bin-orig mkdir $out/bin + moz=$(ls $mozilla/lib/*/libgtkembedmoz.so) + for i in $out/bin-orig/*; do echo "wrapping $(basename $i)" # !!! TODO: figure out the MONO_GAC_PREFIX automatically makeWrapper "$i" "$out/bin/$(basename $i)" \ + --suffix PATH ':' "$(dirname $(type -p mono))" \ --suffix PATH ':' "$(dirname $(type -p mono))" \ --suffix LD_LIBRARY_PATH ':' "$gtksharp/lib" \ --suffix MONO_GAC_PREFIX ':' "$gtksharp" \ --suffix MONO_GAC_PREFIX ':' "$gtkmozembedsharp" \ --suffix MONO_GAC_PREFIX ':' "$gtksourceviewsharp" \ - --suffix MONO_GAC_PREFIX ':' "$monodoc" + --suffix MONO_GAC_PREFIX ':' "$monodoc" \ + --set MOZILLA_FIVE_HOME "$(dirname $moz)" done } diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 5ba1aadd609..63a996e1972 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -2,6 +2,7 @@ , gtkmozembedsharp, monodoc , perl, perlXMLParser, pkgconfig , glib, gtk, gconf, gnomevfs, libbonobo, libglade, libgnome +, mozilla }: stdenv.mkDerivation { @@ -23,5 +24,6 @@ stdenv.mkDerivation { gtkmozembedsharp monodoc ]; - inherit perlXMLParser monodoc gtksharp gtkmozembedsharp gtksourceviewsharp; + inherit perlXMLParser mozilla monodoc + gtksharp gtkmozembedsharp gtksourceviewsharp; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 28d4183f82b..d4b7ac59acc 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -1144,6 +1144,7 @@ rec { inherit fetchurl stdenv file mono gtksourceviewsharp gtkmozembedsharp monodoc perl perlXMLParser pkgconfig; inherit (gnome) gnomevfs libbonobo libglade libgnome gconf glib gtk; + mozilla = firefox; gtksharp = gtksharp2; }; -- cgit 1.4.1