From 1a59276a641f3e5efb6037e281ea961cf7de6229 Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Mon, 26 Nov 2012 13:06:41 +0100 Subject: [PATCH 1/4] qtcreator: update to 2.6.0 --- pkgs/development/qtcreator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index b57b9884e61..2713070ecb4 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, qt4 }: let - version = "2.5.2"; + version = "2.6.0"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ 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 ]; From a40d115a6235f1928ac31c08cf8c7e35a37b9b66 Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Tue, 27 Nov 2012 13:48:48 +0100 Subject: [PATCH 2/4] qt-4.8: Add a developerBuild option This option configures qmake with the -developer-build option. For example, this tells Qt installer to also install Qt's private headers. See http://doc.qt.digia.com/qt/configure-options.html for more. --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 87cec5bb3d9..0acf5c07bbd 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -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 = From 876b1c1cac74f5c247c29e91a012fc8315f604dd Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Tue, 27 Nov 2012 13:54:44 +0100 Subject: [PATCH 3/4] qtcreator: Build QmlDesigner Plugin Building of this plugin required qt's private headers. See http://qt.gitorious.org/qt-creator/qt-creator/blobs/master/README for more. --- pkgs/development/qtcreator/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 2713070ecb4..60ff5ede75a 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4 }: +{ stdenv, fetchurl, qt4_for_qtcreator }: let version = "2.6.0"; @@ -12,13 +12,16 @@ stdenv.mkDerivation rec { 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 = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5945703c6c..df5b806de85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 82bdf7c8d9e537b18a06a4acaf1edd400112e846 Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Wed, 28 Nov 2012 00:21:34 +0100 Subject: [PATCH 4/4] opera|dia|geany: remove the obsolete share/icons/hicolor/icon-theme.cache file 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 --- pkgs/applications/editors/geany/default.nix | 4 ++++ pkgs/applications/graphics/dia/default.nix | 4 ++++ pkgs/applications/networking/browsers/opera/default.nix | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 1c08dc6db8d..289cf7ff8d6 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -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 = '' diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 7662d64e9de..769acd2a3b6 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -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; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index d7a8ac51a06..e03f07c1e23 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -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 = {