summary refs log tree commit diff
diff options
context:
space:
mode:
authorRob Vermaas <rob.vermaas@gmail.com>2010-10-20 10:53:45 +0000
committerRob Vermaas <rob.vermaas@gmail.com>2010-10-20 10:53:45 +0000
commit202774b93e3300a3d1c3ad6e40b744e5fd1c0c44 (patch)
tree95015a8c9f17535ae9604861be9634522d9944eb
parent5a7fa1d061fc6bf4abbb89a15a70a7c819167526 (diff)
downloadnixlib-202774b93e3300a3d1c3ad6e40b744e5fd1c0c44.tar
nixlib-202774b93e3300a3d1c3ad6e40b744e5fd1c0c44.tar.gz
nixlib-202774b93e3300a3d1c3ad6e40b744e5fd1c0c44.tar.bz2
nixlib-202774b93e3300a3d1c3ad6e40b744e5fd1c0c44.tar.lz
nixlib-202774b93e3300a3d1c3ad6e40b744e5fd1c0c44.tar.xz
nixlib-202774b93e3300a3d1c3ad6e40b744e5fd1c0c44.tar.zst
nixlib-202774b93e3300a3d1c3ad6e40b744e5fd1c0c44.zip
added ftgl, gource
svn path=/nixpkgs/trunk/; revision=24379
-rw-r--r--pkgs/development/libraries/ftgl/default.nix13
-rw-r--r--pkgs/tools/misc/gource/default.nix13
-rw-r--r--pkgs/top-level/all-packages.nix4
3 files changed, 30 insertions, 0 deletions
diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix
new file mode 100644
index 000000000000..7d10298ad3ee
--- /dev/null
+++ b/pkgs/development/libraries/ftgl/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, freetype, mesa}:
+ 
+stdenv.mkDerivation {
+  name = "ftgl-2.1.3-rc5";
+  
+  src = fetchurl {
+    url = mirror://sourceforge/ftgl/files/FTGL%20Source/2.1.3%7Erc5/ftgl-2.1.3-rc5.tar.gz ;
+    sha256 = "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l";
+  };
+  
+  buildInputs = [freetype mesa];
+
+}
diff --git a/pkgs/tools/misc/gource/default.nix b/pkgs/tools/misc/gource/default.nix
new file mode 100644
index 000000000000..30e5a73685e6
--- /dev/null
+++ b/pkgs/tools/misc/gource/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL_image, glew, mesa}:
+ 
+stdenv.mkDerivation {
+  name = "gource-0.28";
+  
+  src = fetchurl {
+    url = http://gource.googlecode.com/files/gource-0.28.tar.gz;
+    sha256 = "09538vcf9n21qx4cmcjrki6ilayvm4x6s0zdf00mrd1h0bklhxn3";
+  };
+  
+  buildInputs = [glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa];
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02cbcd7d754d..255bfad963d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -615,6 +615,8 @@ let
     withX11 = true;
   };
 
+  ftgl = callPackage ../development/libraries/ftgl { };
+
   dos2unix = callPackage ../tools/text/dos2unix { };
 
   unix2dos = callPackage ../tools/text/unix2dos { };
@@ -683,6 +685,8 @@ let
 
   gnuvd = callPackage ../tools/misc/gnuvd { };
 
+  gource = callPackage ../tools/misc/gource { };
+
   graphviz = callPackage ../tools/graphics/graphviz {
     inherit (gtkLibs) pango;
   };