qwt: update 5.2.1 -> 5.2.3

Remove patch that don't apply anymore; use sed instead.
wip/yesman
Bjørn Forsman 10 years ago
parent a5e1fa2479
commit 9367a92569
  1. 9
      pkgs/development/libraries/qwt/default.nix
  2. 24
      pkgs/development/libraries/qwt/prefix.diff

@ -1,20 +1,19 @@
{ stdenv, fetchurl, qt4 }:
stdenv.mkDerivation rec {
name = "qwt-5.2.1";
name = "qwt-5.2.3";
src = fetchurl {
url = "mirror://sourceforge/qwt/${name}.tar.bz2";
sha256 = "17snmh8qwsgb4j2yiyzmi0s1jli14vby5wv1kv4kvjq4aisvpf72";
sha256 = "1dqa096mm6n3bidfq2b67nmdsvsw4ndzzd1qhl6hn8skcwqazzip";
};
propagatedBuildInputs = [ qt4 ];
patches = [ ./prefix.diff ];
postPatch = ''
sed -e "s@\$\$\[QT_INSTALL_PLUGINS\]@$out/lib/qt4/plugins@" -i designer/designer.pro
'';
sed -e "s|INSTALLBASE.*=.*|INSTALLBASE = $out|g" -i qwtconfig.pri
'';
configurePhase = ''qmake INSTALLBASE=$out -after doc.path=$out/share/doc/${name} -r'';

@ -1,24 +0,0 @@
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
Loading…
Cancel
Save