forked from mirrors/nixpkgs
Fix most packages depending on fltk
I failed to build cinepaint svn path=/nixpkgs/trunk/; revision=31224
This commit is contained in:
Yury G. Kudryashov
parent
046ddeb32a
commit
e785aae6e8
|
|
@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1rpf63pdn54c4yg13k7cb1w1c7zsvl97c4qxcpz41c8l91xd55kn";
|
||||
};
|
||||
|
||||
patches = [ ./fltk-path.patch ];
|
||||
|
||||
buildInputs = [ alsaLib alsaUtils fltk jackaudio libXft libXpm libjpeg
|
||||
libpng libsamplerate libsndfile zlib ];
|
||||
|
||||
|
|
|
|||
35
pkgs/applications/audio/rakarrack/fltk-path.patch
Normal file
35
pkgs/applications/audio/rakarrack/fltk-path.patch
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
commit 47245c3fd30dc326fedd7cdae444ddcf0fd97490
|
||||
Author: holborn <holborn@users.sourceforge.net>
|
||||
Date: Tue Apr 19 15:02:26 2011 +0100
|
||||
|
||||
Fix FL path
|
||||
|
||||
modified: src/global.h
|
||||
modified: src/process.C
|
||||
|
||||
diff --git a/src/global.h b/src/global.h
|
||||
index fc74b06..3e33da9 100644
|
||||
--- a/src/global.h
|
||||
+++ b/src/global.h
|
||||
@@ -176,7 +176,7 @@ return y;
|
||||
#include <X11/xpm.h>
|
||||
#include <jack/jack.h>
|
||||
#include <jack/midiport.h>
|
||||
-#include <Fl/Fl_Preferences.H>
|
||||
+#include <FL/Fl_Preferences.H>
|
||||
#include "FPreset.h"
|
||||
#include "Reverb.h"
|
||||
#include "Chorus.h"
|
||||
diff --git a/src/process.C b/src/process.C
|
||||
index 51bbc65..c993ff8 100644
|
||||
--- a/src/process.C
|
||||
+++ b/src/process.C
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
-#include <Fl/Fl_Preferences.H>
|
||||
+#include <FL/Fl_Preferences.H>
|
||||
#include "global.h"
|
||||
|
||||
int Pexitprogram, preset;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, alsaLib, boost, cmakeCurses, fftwSinglePrec, fltk
|
||||
{ stdenv, fetchurl, alsaLib, boost, cmake, fftwSinglePrec, fltk
|
||||
, jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib }:
|
||||
|
||||
assert stdenv ? glibc;
|
||||
|
|
@ -12,12 +12,18 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0y67w7y515hx2bi5gfjgsw1hdah1bdrrvcfmqyjsvn7jbd0q47v1";
|
||||
};
|
||||
|
||||
buildInputs = [ alsaLib boost cmakeCurses fftwSinglePrec fltk
|
||||
jackaudio libsndfile mesa minixml pkgconfig zlib ];
|
||||
buildInputs = [ alsaLib boost fftwSinglePrec fltk jackaudio libsndfile mesa
|
||||
minixml zlib ];
|
||||
buildNativeInputs = [ cmake pkgconfig ];
|
||||
|
||||
preConfigure = ''
|
||||
cd src
|
||||
'';
|
||||
preConfigure = "cd src";
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
url = http://patch-tracker.debian.org/patch/series/dl/yoshimi/0.060.10-3/02-fluid_1.3.patch;
|
||||
sha256 = "1sywirbaaw4zhn5ypga27j02qvrvqjwv3lw8kvzyj575q4c4qnri";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc}/lib/libm.so" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, alsaLib, fftw, fltk, minixml, zlib }:
|
||||
{ stdenv, fetchurl, alsaLib, cmake, fftw, fltk13, minixml, pkgconfig, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zynaddsubfx-${version}";
|
||||
|
|
@ -9,11 +9,17 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1zn5lgh76rrbfj8d4jys2gc1j2pqrbdd18ywfdrk0s7jq4inwyfg";
|
||||
};
|
||||
|
||||
buildInputs = [ alsaLib fftw fltk minixml zlib ];
|
||||
buildInputs = [ alsaLib fftw fltk13 minixml zlib ];
|
||||
buildNativeInputs = [ cmake pkgconfig ];
|
||||
|
||||
preConfigure = "cd src";
|
||||
patches = [
|
||||
(fetchurl {
|
||||
url = http://patch-tracker.debian.org/patch/series/dl/zynaddsubfx/2.4.0-1.2/09_fluid_1.3.patch;
|
||||
sha256 = "06wl7fs44b24ls1fzh21596n6zzc3ywm2bcdfrkfiiwpzin3yjq6";
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = "mkdir -p $out/bin; cp zynaddsubfx $out/bin";
|
||||
#installPhase = "mkdir -pv $out/bin; cp -v zynaddsubfx $out/bin";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "high quality software synthesizer";
|
||||
|
|
|
|||
|
|
@ -1,41 +1,32 @@
|
|||
{ stdenv, fetchcvs, cmake, pkgconfig, gtk, freetype, fontconfig, lcms, fltk,
|
||||
{ stdenv, fetchurl, cmake, pkgconfig, gtk, freetype, fontconfig, lcms,
|
||||
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, automake, autoconf, libtool } :
|
||||
mesa, libXext, libXpm, libXxf86vm, pixman, libpthreadstubs } :
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "cinepaint-0.25.0";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cinepaint-1.0";
|
||||
|
||||
# The developer told me this cvs fetch is 0.25.0
|
||||
src = fetchcvs {
|
||||
cvsRoot = ":pserver:anonymous@cinepaint.cvs.sourceforge.net:/cvsroot/cinepaint";
|
||||
module = "cinepaint-project";
|
||||
date = "2008-11-06";
|
||||
sha256 = "f5ac249628ffe04349d1bb3b1e078be0cda7575dd71d12ae74143baa006acb6d";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/cinepaint/${name}.tgz";
|
||||
sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake pkgconfig gtk freetype fontconfig lcms fltk 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 automake autoconf libtool ];
|
||||
buildInputs = [ gtk freetype fontconfig lcms 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
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = 1;
|
||||
buildNativeInputs = [ cmake pkgconfig ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I.";
|
||||
|
||||
configurePhase = ''
|
||||
cd cinepaint
|
||||
chmod 0777 autogen.sh
|
||||
./autogen.sh
|
||||
./configure --prefix=$out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://www.cinepaint.org/;
|
||||
license = "free";
|
||||
description = "Image editor which supports images over 8bpp and ICC profiles";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6448,9 +6448,7 @@ let
|
|||
|
||||
compiz_plugins_extra = callPackage ../applications/window-managers/compiz/plugins-extra.nix { };
|
||||
|
||||
cinepaint = callPackage ../applications/graphics/cinepaint {
|
||||
fltk = fltk13;
|
||||
};
|
||||
cinepaint = callPackage ../applications/graphics/cinepaint { };
|
||||
|
||||
codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) {
|
||||
inherit makeWrapper;
|
||||
|
|
@ -7703,9 +7701,7 @@ let
|
|||
|
||||
zathura = callPackage ../applications/misc/zathura { };
|
||||
|
||||
zynaddsubfx = callPackage ../applications/audio/zynaddsubfx {
|
||||
fltk = fltk13;
|
||||
};
|
||||
zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { };
|
||||
|
||||
### GAMES
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue