Author: urkud
Date: Thu Aug 11 09:35:10 2011
New Revision: 28482
URL: https://svn.nixos.org/websvn/nix/?rev=28482&sc=1
Log:
Add qwt-5.2.1
Added:
nixpkgs/trunk/pkgs/development/libraries/qwt/
nixpkgs/trunk/pkgs/development/libraries/qwt/default.nix
nixpkgs/trunk/pkgs/development/libraries/qwt/prefix.diff
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/qwt/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/qwt/default.nix Thu Aug 11
09:35:10 2011 (r28482)
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, qt4 }:
+
+stdenv.mkDerivation rec {
+ name = "qwt-5.2.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/qwt/${name}.tar.bz2";
+ sha256 = "17snmh8qwsgb4j2yiyzmi0s1jli14vby5wv1kv4kvjq4aisvpf72";
+ };
+
+ propagatedBuildInputs = [ qt4 ];
+
+ patches = [ ./prefix.diff ];
+
+ postPatch = ''
+ sed -e "s@\$\$\[QT_INSTALL_PLUGINS\]@$out/lib/qt4/plugins@" -i
designer/designer.pro
+ '';
+
+ configurePhase = ''qmake INSTALLBASE=$out -after
doc.path=$out/share/doc/${name} -r'';
+}
Added: nixpkgs/trunk/pkgs/development/libraries/qwt/prefix.diff
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/qwt/prefix.diff Thu Aug 11
09:35:10 2011 (r28482)
@@ -0,0 +1,24 @@
+diff --git a/qwtconfig.pri b/qwtconfig.pri
+index 2be4a68..8625686 100644
+--- a/qwtconfig.pri
++++ b/qwtconfig.pri
+@@ -7,12 +7,14 @@ VER_MIN = 2
+ VER_PAT = 1
+ VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
+
+-unix {
+- INSTALLBASE = /usr/local/qwt-5.2.1
+-}
++isEmpty(INSTALLBASE) {
++ unix {
++ INSTALLBASE = /usr/local/qwt-5.2.1
++ }
+
+-win32 {
+- INSTALLBASE = C:/Qwt-5.2.1
++ win32 {
++ INSTALLBASE = C:/Qwt-5.2.1
++ }
+ }
+
+ target.path = $$INSTALLBASE/lib
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Aug 11 02:29:10
2011 (r28481)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Aug 11 09:35:10
2011 (r28482)
@@ -4299,6 +4299,8 @@
quesoglc = callPackage ../development/libraries/quesoglc { };
+ qwt = callPackage ../development/libraries/qwt {};
+
readline = readline6;
readline4 = callPackage ../development/libraries/readline/readline4.nix { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
