Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: NixOS/nixpkgs
...
head fork: NixOS/nixpkgs
  • 7 commits
  • 12 files changed
  • 0 commit comments
  • 2 contributors
Commits on Jul 02, 2012
viric viric fltk: updating, the old url didn't work. f0e4e77
viric viric cinepaint: updating, and making it build
I wrote a little patch for the cmake files, or it
didn't install.

I also used the NIX_LDFLAGS trick; they are not doing proper linking somehow.
dcdea9d
civodul civodul viking: Update to 1.3. cb0d79e
viric viric xineLib: update to 1.2.2 946f2c1
viric viric xine-ui: update to 0.99.7 8a764b7
viric viric eaglemode: update to 0.84.0
It failds to build with xine-lib, but it goes on as it's
not a strong requirement. Then, the final path is not dependant
on xine anymore. I hope next releases fix this.
5592b1f
viric viric xine-lib: removing a now unused patch
I forgot that in a previous commit.
ef1d8eb
12 pkgs/applications/graphics/cinepaint/default.nix
View
@@ -2,7 +2,7 @@
flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
perlXMLParser, python, pygtk, gettext, intltool, babl, gegl,
glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
- mesa, libXext, libXpm, libXxf86vm, pixman, libpthreadstubs } :
+ mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
stdenv.mkDerivation rec {
name = "cinepaint-1.0";
@@ -12,15 +12,19 @@ stdenv.mkDerivation rec {
sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7";
};
- buildInputs = [ gtk freetype fontconfig lcms flex libtiff libjpeg libpng
+ buildInputs = [ libpng gtk freetype fontconfig lcms flex libtiff libjpeg
libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl
gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa
- libXext libXpm libXxf86vm pixman libpthreadstubs
+ libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk
];
+ patches = [ ./install.patch ];
+
buildNativeInputs = [ cmake pkgconfig ];
- NIX_CFLAGS_COMPILE = "-I.";
+ NIX_LDFLAGS = "-llcms -ljpeg";
+
+ # NIX_CFLAGS_COMPILE = "-I.";
meta = {
homepage = http://www.cinepaint.org/;
24 pkgs/applications/graphics/cinepaint/install.patch
View
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dfb182f..5adaaa5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -138,7 +138,7 @@ STRING(REPLACE "/" "\\/" ESCAPEDPREFIX ${PREFIX})
+ # Note that for MacOS this needs to be revised
+ # for the @OSX_ICC...@ variables
+ ADD_CUSTOM_COMMAND(
+- OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/gimprc
++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gimprc
+ COMMAND sed -e s/\@platform\@//g
+ -e s/\@prefix\@/${ESCAPEDPREFIX}/g
+ -e s/\@exec_prefix\@/\${prefix}/g
+@@ -155,8 +155,8 @@ ADD_CUSTOM_COMMAND(
+
+ ADD_CUSTOM_TARGET(RCFile ALL echo
+ ""
+- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/user_install
+- ${CMAKE_CURRENT_SOURCE_DIR}/gimprc
++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/user_install
++ ${CMAKE_CURRENT_BINARY_DIR}/gimprc
+ )
+
+
11 pkgs/applications/misc/eaglemode/default.nix
View
@@ -2,11 +2,11 @@
librsvg, glib, gtk, libXext, libXxf86vm, poppler }:
stdenv.mkDerivation {
- name = "eaglemode-0.83.0";
+ name = "eaglemode-0.84.0";
src = fetchurl {
- url = mirror://sourceforge/eaglemode/eaglemode-0.83.0.tar.bz2;
- sha256 = "0rlvi9ljf3ml2l4ydkcgjjja8wk9c7h5qlpdr4x4ghh6sqq0q2x3";
+ url = mirror://sourceforge/eaglemode/eaglemode-0.84.0.tar.bz2;
+ sha256 = "0n20b419j0l7h7jr4s3f3n09ka0ysg9nqs8mcwsrx24rcq7nv0cs";
};
buildInputs = [ perl libX11 xineLib libjpeg libpng libtiff pkgconfig
@@ -14,9 +14,12 @@ stdenv.mkDerivation {
# The program tries to dlopen both Xxf86vm and Xext, so we use the
# trick on NIX_LDFLAGS and dontPatchELF to make it find them.
+ # I use 'yes y' to skip a build error linking with xineLib,
+ # because xine stopped exporting "_x_vo_new_port"
+ # http://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261
buildPhase = ''
export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext"
- yes n | perl make.pl build
+ yes y | perl make.pl build
'';
dontPatchELF = true;
26 pkgs/applications/misc/viking/default.nix
View
@@ -1,19 +1,27 @@
{ fetchurl, stdenv, pkgconfig, intltool, gettext, gtk, expat, curl
-, gpsd, bc, file }:
+, gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper
+, docbook_xml_dtd_412 }:
-stdenv.mkDerivation rec {
- name = "viking-0.9.8";
+let version = "1.3"; in
+stdenv.mkDerivation {
+ name = "viking-${version}";
src = fetchurl {
- url = "mirror://sourceforge/viking/${name}.tar.gz";
- sha256 = "1is8g6ld5pd13iiv9qm8526q1cblg01pqyakg52sd6k7fys7dz2d";
+ url = "mirror://sourceforge/viking/viking/${version}/viking-${version}.tar.gz";
+ sha256 = "1psgy1myx9xn7zgpvqrpricsv041sz41mm82hj5i28k72fq47p2l";
};
- patches = [
- ./test-bc.patch ./gpsdclient.patch ./implicit-declaration.patch
- ];
+ buildInputs =
+ [ pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils
+ libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412
+ ];
- buildInputs = [ pkgconfig intltool gettext gtk expat curl gpsd bc file ];
+ configureFlags = [ "--disable-scrollkeeper" ];
+
+ preBuild =
+ '' sed -i help/Makefile \
+ -e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g'
+ '';
doCheck = true;
51 pkgs/applications/misc/viking/gpsdclient.patch
View
@@ -1,51 +0,0 @@
-Debian patch that allows compilation with libgps (from `gpsd').
-Failing to apply this patch, we get the following error:
-
- vikgpslayer.c:237: error: field 'realtime_gpsd_unit' has incomplete type
- vikgpslayer.c: In function 'vik_gps_layer_new':
- vikgpslayer.c:473: warning: implicit declaration of function 'gpsd_units'
- vikgpslayer.c: In function 'rt_gpsd_try_connect':
- vikgpslayer.c:1321: warning: passing argument 2 of 'gps_set_raw_hook' from incompatible pointer type
-
-diff -urNad trunk~/src/gpsdclient.h trunk/src/gpsdclient.h
---- trunk~/src/gpsdclient.h 1970-01-01 01:00:00.000000000 +0100
-+++ trunk/src/gpsdclient.h 2009-04-15 14:30:22.000000000 +0200
-@@ -0,0 +1,25 @@
-+/* $Id: gpsdclient.h 5330 2009-03-03 04:05:42Z ckuethe $ */
-+/* gpsdclient.h -- common functions for GPSD clients */
-+
-+#ifndef _GPSD_GPSDCLIENT_H_
-+#define _GPSD_GPSDCLIENT_H_
-+struct fixsource_t
-+/* describe a data source */
-+{
-+ char *spec; /* pointer to actual storage */
-+ char *server;
-+ char *port;
-+ char *device;
-+};
-+
-+enum unit {unspecified, imperial, nautical, metric};
-+enum unit gpsd_units(void);
-+enum deg_str_type { deg_dd, deg_ddmm, deg_ddmmss };
-+
-+extern /*@observer@*/ char *deg_to_str( enum deg_str_type type, double f);
-+
-+extern void gpsd_source_spec(/*@null@*/const char *fromstring,
-+ /*@out@*/struct fixsource_t *source);
-+
-+#endif /* _GPSDCLIENT_H_ */
-+/* gpsdclient.h ends here */
-diff -urNad trunk~/src/vikgpslayer.c trunk/src/vikgpslayer.c
---- trunk~/src/vikgpslayer.c 2009-02-08 14:47:01.000000000 +0100
-+++ trunk/src/vikgpslayer.c 2009-04-15 14:30:55.000000000 +0200
-@@ -39,6 +39,9 @@
- #include <glib/gi18n.h>
- #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
- #include <gps.h>
-+#ifndef gpsd_units
-+#include "gpsdclient.h"
-+#endif
- #endif
-
- #if ! GLIB_CHECK_VERSION(2,14,0)
13 pkgs/applications/misc/viking/implicit-declaration.patch
View
@@ -1,13 +0,0 @@
-Debian patch that fixes an implicat declaration.
-
-diff -urNad trunk~/src/util.c trunk/src/util.c
---- trunk~/src/util.c 2009-02-08 14:47:01.000000000 +0100
-+++ trunk/src/util.c 2009-04-15 17:23:44.000000000 +0200
-@@ -26,6 +26,7 @@
- #endif
-
- #include <glib/gi18n.h>
-+#include <glib/gprintf.h>
-
- #include "dialog.h"
-
22 pkgs/applications/misc/viking/test-bc.patch
View
@@ -1,22 +0,0 @@
-For some reason, `bc -l' yields no output.
-
---- viking-0.9.8/test/check_degrees_conversions.sh 2008-03-15 23:01:48.000000000 +0100
-+++ viking-0.9.8/test/check_degrees_conversions.sh 2009-05-30 23:23:27.000000000 +0200
-@@ -7,7 +7,7 @@ function check_success()
- for value in "$@"
- do
- result=`./degrees_converter "$value" | cut -d' ' -f3`
-- diff=`echo "$result - $expected" | bc -l`
-+ diff=`echo "$result - $expected" | bc`
- if [ $diff != 0 ]
- then
- echo "$value -> $result != $expected"
-@@ -23,7 +23,7 @@ function check_failure()
- for value in "$@"
- do
- result=`./degrees_converter "$value" | cut -d' ' -f3`
-- diff=`echo "$result - $expected" | bc -l`
-+ diff=`echo "$result - $expected" | bc`
- if [ $diff = 0 ]
- then
- echo "$value -> $result = $expected"
10 pkgs/applications/video/xine-ui/default.nix
View
@@ -1,18 +1,18 @@
-{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng12, readline, ncurses, curl
-, lirc, shared_mime_info }:
+{stdenv, fetchurl, pkgconfig, xlibs, libpng, xineLib, readline, ncurses, curl
+, lirc, shared_mime_info, libjpeg }:
stdenv.mkDerivation rec {
- name = "xine-ui-0.99.6";
+ name = "xine-ui-0.99.7";
src = fetchurl {
url = "mirror://sourceforge/xine/${name}.tar.xz";
- sha256 = "1wwylnckm5kfq5fi154w8jqf5cwvp7c1ani15q7sgfrfdkmy7caf";
+ sha256 = "1i3byriqav06b55kwzs4dkzrjw7mmmcv0rc7jzb52hn8qp8xz34x";
};
buildNativeInputs = [ pkgconfig shared_mime_info ];
buildInputs =
- [ xineLib libpng12 readline ncurses curl lirc
+ [ xineLib libpng readline ncurses curl lirc libjpeg
xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto
xlibs.libXinerama xlibs.libXi xlibs.libXft
];
4 pkgs/development/libraries/fltk/default.nix
View
@@ -4,11 +4,11 @@
let inherit (composableDerivation) edf; in
composableDerivation.composableDerivation {} rec {
- name = "fltk-2.0.x-alpha-r8550";
+ name = "fltk-2.0.x-alpha-r9296";
src = fetchurl {
url = "ftp://ftp.easysw.com/pub/fltk/snapshots/${name}.tar.bz2";
- sha256 = "0y9fazsv61j8dkg9aiinnw4nd68h7zxmvapmygrl4rq5ywqygng7";
+ sha256 = "0353ngb7gpyklc9mdz8629big2na3c73akfwhis8fhqp7jkbs9ih";
};
propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
14 pkgs/development/libraries/xine-lib/default.nix
View
@@ -5,21 +5,13 @@
}:
stdenv.mkDerivation rec {
- name = "xine-lib-1.2.0";
+ name = "xine-lib-1.2.2";
src = fetchurl {
- url = "mirror://sourceforge/xine/${name}.tar.bz2";
- sha256 = "1yss9cxxkcb6dzrv78xvi845ls6lhhbv6g8yfm6zjjl07v7jbm6c";
+ url = "mirror://sourceforge/xine/${name}.tar.xz";
+ sha256 = "1mjk686h1qzqj51h4xs4xvagfgnnhm8czbzzjvr5w034pr8n8rg1";
};
- patches = [ ./zlib126.patch ];
-# patches =
-# [ (fetchurl {
-# url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.1.19-ffmpeg.patch?revision=1.1";
-# sha256 = "0dqr0kc829djfn0wvk4jg84v61pxynqbp4s4phvywd7x9caf092b";
-# })
-# ];
-
buildNativeInputs = [ pkgconfig perl ];
buildInputs = [
52 pkgs/development/libraries/xine-lib/zlib126.patch
View
@@ -1,52 +0,0 @@
-http://anonscm.debian.org/hg/xine-lib/xine-lib/rev/24d09421ed09
-
-# HG changeset patch
-# User Ulrich Müller <ulm@gentoo.org>
-# Date 1327945720 0
-# Node ID 24d09421ed09d3a78efeab5c9b8ab31daaaba4fd
-# Parent da296856c52e654cf599248de3a01bb754363c79
-Compile failure in osd.c with sys-libs/zlib-1.2.6
-
-diff -r da296856c52e -r 24d09421ed09 misc/xine-fontconv.c
---- a/misc/xine-fontconv.c Wed Jan 18 22:01:28 2012 +0000
-+++ b/misc/xine-fontconv.c Mon Jan 30 17:48:40 2012 +0000
-@@ -109,7 +109,7 @@
- osd_font_t font;
-
-
--static int gzwrite_i16(gzFile *fp, uint16_t number) {
-+static int gzwrite_i16(gzFile fp, uint16_t number) {
- return gzputc(fp, number & 0xFF) != -1 &&
- gzputc(fp, (number >> 8) & 0xFF) != -1;
- }
-@@ -341,7 +341,7 @@
-
- char filename[1024];
- FT_Bitmap *out_bitmap;
-- gzFile *fp;
-+ gzFile fp;
- int error;
- int error_counter;
- int glyph_index;
-diff -r da296856c52e -r 24d09421ed09 src/xine-engine/osd.c
---- a/src/xine-engine/osd.c Wed Jan 18 22:01:28 2012 +0000
-+++ b/src/xine-engine/osd.c Mon Jan 30 17:48:40 2012 +0000
-@@ -650,7 +650,7 @@
- osd->display_y = y;
- }
-
--static uint16_t gzread_i16(gzFile *fp) {
-+static uint16_t gzread_i16(gzFile fp) {
- uint16_t ret;
- ret = gzgetc(fp);
- ret |= (gzgetc(fp)<<8);
-@@ -663,7 +663,7 @@
-
- static int osd_renderer_load_font(osd_renderer_t *this, char *filename) {
-
-- gzFile *fp;
-+ gzFile fp;
- osd_font_t *font = NULL;
- int i, ret = 0;
-
-
9 pkgs/top-level/all-packages.nix
View
@@ -1533,7 +1533,9 @@ let
vifm = callPackage ../applications/misc/vifm {};
- viking = callPackage ../applications/misc/viking { };
+ viking = callPackage ../applications/misc/viking {
+ inherit (gnome) scrollkeeper;
+ };
vncrec = builderDefsPackage ../tools/video/vncrec {
inherit (xlibs) imake libX11 xproto gccmakedep libXt
@@ -6402,7 +6404,10 @@ let
compiz_plugins_extra = callPackage ../applications/window-managers/compiz/plugins-extra.nix { };
- cinepaint = callPackage ../applications/graphics/cinepaint { };
+ cinepaint = callPackage ../applications/graphics/cinepaint {
+ fltk = fltk13;
+ libpng = libpng12;
+ };
codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) {
inherit makeWrapper;

No commit comments for this range

Something went wrong with that request. Please try again.