diff --git a/pkgs/applications/editors/monodevelop/builder.sh b/pkgs/applications/editors/monodevelop/builder.sh index bd4b282c7c4a..eb42bc54f4c3 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 5ba1aadd6091..63a996e1972d 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 28d4183f82bb..d4b7ac59accb 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; };