From 19d7e43cf3214d2ac1ba95c8abb01cc5b1bca593 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Mar 2005 15:44:23 +0000 Subject: [PATCH] * Added gtksourceview and gtksourceview-sharp. svn path=/nixpkgs/trunk/; revision=2344 --- .../editors/monodevelop/default.nix | 12 ++++++++---- pkgs/development/libraries/gnome/default.nix | 7 +++++++ .../libraries/gnome/gtksourceview/default.nix | 14 ++++++++++++++ .../libraries/gnome/libgnomeprint/default.nix | 4 ++-- .../gnome/src-gnome-desktop-2.8.3.nix | 8 ++++++++ .../libraries/gtksourceview-sharp/builder.sh | 11 +++++++++++ .../libraries/gtksourceview-sharp/default.nix | 19 +++++++++++++++++++ pkgs/system/all-packages-generic.nix | 8 +++++++- 8 files changed, 76 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/libraries/gnome/gtksourceview/default.nix create mode 100644 pkgs/development/libraries/gtksourceview-sharp/builder.sh create mode 100644 pkgs/development/libraries/gtksourceview-sharp/default.nix diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 1dee7d2396a1..10b4a8813ba3 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,7 +1,9 @@ -{stdenv, fetchurl, mono, gtksharp, perl, perlXMLParser, pkgconfig, glib, gconf, gnomevfs, libbonobo}: +{ stdenv, fetchurl, mono, gtksharp, gtksourceviewsharp +, perl, perlXMLParser, pkgconfig +, glib, gconf, gnomevfs, libbonobo}: stdenv.mkDerivation { - name = "MonoDevelop-0.5.1"; + name = "monodevelop-0.5.1"; builder = ./builder.sh; src = fetchurl { @@ -9,7 +11,9 @@ stdenv.mkDerivation { md5 = "d89458a2d909da09b2cc1f37e16d8990"; }; - buildInputs = [mono gtksharp perl pkgconfig gnomevfs glib libbonobo gconf]; + buildInputs = [ + mono gtksharp gtksourceviewsharp perl pkgconfig gnomevfs + glib libbonobo gconf + ]; inherit perlXMLParser; } - \ No newline at end of file diff --git a/pkgs/development/libraries/gnome/default.nix b/pkgs/development/libraries/gnome/default.nix index ffae40360444..87b78f568624 100644 --- a/pkgs/development/libraries/gnome/default.nix +++ b/pkgs/development/libraries/gnome/default.nix @@ -141,4 +141,11 @@ rec { inherit fetchurl stdenv pkgconfig glib gtk; input = desktop.gnomekeyring; }; + + gtksourceview = (import ./gtksourceview) { + inherit fetchurl stdenv pkgconfig perl perlXMLParser gtk libxml2 + libgnomeprint gnomevfs libbonobo /* !!! <- should be propagated in gnomevfs */ + gconf /* idem */ libgnomeprintui libgnomecanvas /* !!! through printui */; + input = desktop.gtksourceview; + }; } \ No newline at end of file diff --git a/pkgs/development/libraries/gnome/gtksourceview/default.nix b/pkgs/development/libraries/gnome/gtksourceview/default.nix new file mode 100644 index 000000000000..978a63ed7a11 --- /dev/null +++ b/pkgs/development/libraries/gnome/gtksourceview/default.nix @@ -0,0 +1,14 @@ +{ input, stdenv, fetchurl, perl, perlXMLParser, pkgconfig +, gtk, libxml2, libgnomeprint, gnomevfs, libbonobo, gconf +, libgnomeprintui, libgnomecanvas +}: + +stdenv.mkDerivation { + inherit (input) name src; + buildInputs = [ + perl perlXMLParser pkgconfig gnomevfs + libbonobo gconf libgnomeprintui libgnomecanvas + ]; + propagatedBuildInputs = [gtk libxml2 libgnomeprint]; + PERL5LIB = perlXMLParser ~ "/lib/site_perl"; # !!! +} diff --git a/pkgs/development/libraries/gnome/libgnomeprint/default.nix b/pkgs/development/libraries/gnome/libgnomeprint/default.nix index 0792571b98aa..16777e37d2bd 100644 --- a/pkgs/development/libraries/gnome/libgnomeprint/default.nix +++ b/pkgs/development/libraries/gnome/libgnomeprint/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation { buildInputs = [ perl perlXMLParser pkgconfig popt libxml2 - glib pango libart + glib pango ]; - propagatedBuildInputs = [libxml2]; + propagatedBuildInputs = [libxml2 libart]; PERL5LIB = perlXMLParser ~ "/lib/site_perl"; } diff --git a/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix b/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix index fbb87f1b3d3a..b0ada94d4b98 100644 --- a/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix +++ b/pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix @@ -31,4 +31,12 @@ md5 = "c77789241d725e189ffc0391eda94361"; }; }; + + gtksourceview = { + name = "gtksourceview-1.1.1"; + src = fetchurl { + url = ftp://ftp.gnome.org/Public/gnome/desktop/2.8/2.8.3/sources/gtksourceview-1.1.1.tar.bz2; + md5 = "2e59c8748594181d4bf452320c8c3b5c"; + }; + }; } \ No newline at end of file diff --git a/pkgs/development/libraries/gtksourceview-sharp/builder.sh b/pkgs/development/libraries/gtksourceview-sharp/builder.sh new file mode 100644 index 000000000000..f6911c63ac92 --- /dev/null +++ b/pkgs/development/libraries/gtksourceview-sharp/builder.sh @@ -0,0 +1,11 @@ +. $stdenv/setup + +genericBuild + +# !!! hack +export ALL_INPUTS="$out $pkgs" + +find $out -name "*.dll.config" | while read configFile; do + echo "modifying config file $configFile" + $monoDLLFixer "$configFile" +done diff --git a/pkgs/development/libraries/gtksourceview-sharp/default.nix b/pkgs/development/libraries/gtksourceview-sharp/default.nix new file mode 100644 index 000000000000..381170584884 --- /dev/null +++ b/pkgs/development/libraries/gtksourceview-sharp/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, pkgconfig, mono, gtksharp, gtksourceview, monoDLLFixer}: + +stdenv.mkDerivation { + name = "gtksourceview-sharp-0.5"; + + builder = ./builder.sh; + src = fetchurl { + url = http://www.go-mono.com/archive/1.0/gtksourceview-sharp-0.5.tar.gz; + md5 = "b82e767e42a542e185a534048db3078d"; + }; + + patches = [ ./prefix.patch ]; + + buildInputs = [ + pkgconfig mono gtksharp gtksourceview + ]; + + inherit monoDLLFixer; +} diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 53879fc03a6b..60563f466c60 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -643,6 +643,11 @@ rec { libgnomeprintui gconf; }; + gtksourceviewsharp = import ../development/libraries/gtksourceview-sharp { + inherit fetchurl stdenv mono pkgconfig gtksharp monoDLLFixer; + inherit (gnome) gtksourceview; + }; + audiofile = (import ../development/libraries/audiofile) { inherit fetchurl stdenv; }; @@ -1122,7 +1127,8 @@ rec { }; monodevelop = (import ../applications/editors/monodevelop) { - inherit fetchurl stdenv mono gtksharp perl perlXMLParser pkgconfig; + inherit fetchurl stdenv mono gtksharp gtksourceviewsharp + perl perlXMLParser pkgconfig; inherit (gnome) gnomevfs libbonobo gconf glib; };