Merge pull request #199 from bbenoist/fix

Fixes and updates on qt-4.8, qtcreator, opera, dia and geany
This commit is contained in:
Peter Simons 2012-11-28 01:14:37 -08:00
commit 46d1acdcf1
6 changed files with 26 additions and 5 deletions

View file

@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
# It have no reasons to exist in a redistribuable package
postInstall = "rm $out/share/icons/hicolor/icon-theme.cache";
meta = {
description = "A GTK2 small and ligthweight IDE.";
longDescription = ''

View file

@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
patches = [ ./glib-top-level-header.patch ];
# This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
# It have no reasons to exist in a redistribuable package
postInstall = "rm $out/share/icons/hicolor/icon-theme.cache";
meta = {
description = "Gnome Diagram drawing software";
homepage = http://live.gnome.org/Dia;

View file

@ -73,6 +73,10 @@ stdenv.mkDerivation rec {
postFixup = ''
oldRPATH=`patchelf --print-rpath $out/lib/opera/opera`
patchelf --set-rpath $oldRPATH:${cups}/lib $out/lib/opera/opera
# This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
# It have no reasons to exist in a redistribuable package
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = {

View file

@ -9,6 +9,7 @@
, buildWebkit ? true
, flashplayerFix ? false, gdk_pixbuf
, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs
, developerBuild ? false
}:
with stdenv.lib;
@ -74,6 +75,7 @@ stdenv.mkDerivation rec {
-nomake demos -nomake examples -nomake docs
-no-phonon ${if buildWebkit then "" else "-no"}-webkit ${if buildMultimedia then "" else "-no"}-multimedia -audio-backend
${if developerBuild then "-developer-build" else ""}
'';
propagatedBuildInputs =

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, qt4 }:
{ stdenv, fetchurl, qt4_for_qtcreator }:
let
version = "2.5.2";
version = "2.6.0";
in
stdenv.mkDerivation rec {
@ -9,16 +9,19 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://origin.releases.qt-project.org/qtcreator/${version}/qt-creator-${version}-src.tar.gz";
md5 = "4a9c09cdf4609753283c31451c84ceb8";
md5 = "9bf01098f84a0fe930b2718d11124204";
};
buildInputs = [ qt4 ];
buildInputs = [ qt4_for_qtcreator ];
doCheck = false;
enableParallelBuilding = true;
preConfigure = "qmake";
preConfigure = ''
qmake -spec linux-g++ "QT_PRIVATE_HEADERS=${qt4_for_qtcreator}/include" qtcreator.pro
'';
installFlags = "INSTALL_ROOT=$(out)";
meta = {

View file

@ -4795,6 +4795,10 @@ let
gst_plugins_base = null;
};
qt4_for_qtcreator = qt48.override {
developerBuild = true;
};
qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { };
quesoglc = callPackage ../development/libraries/quesoglc { };