diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-12-02 21:55:42 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-12-02 22:56:43 +0100 |
| commit | 9367a925691065f920dfc0ae25b3e4f5dedaf960 (patch) | |
| tree | 86f3f51c6067d1f85729e38b4632c1b429360410 /pkgs/development/libraries/qwt | |
| parent | a5e1fa2479fbfaa57d08ebaa84bf138b4b7aada2 (diff) | |
| download | nixpkgs-9367a925691065f920dfc0ae25b3e4f5dedaf960.tar nixpkgs-9367a925691065f920dfc0ae25b3e4f5dedaf960.tar.gz nixpkgs-9367a925691065f920dfc0ae25b3e4f5dedaf960.tar.bz2 nixpkgs-9367a925691065f920dfc0ae25b3e4f5dedaf960.tar.lz nixpkgs-9367a925691065f920dfc0ae25b3e4f5dedaf960.tar.xz nixpkgs-9367a925691065f920dfc0ae25b3e4f5dedaf960.tar.zst nixpkgs-9367a925691065f920dfc0ae25b3e4f5dedaf960.zip | |
qwt: update 5.2.1 -> 5.2.3
Remove patch that don't apply anymore; use sed instead.
Diffstat (limited to 'pkgs/development/libraries/qwt')
| -rw-r--r-- | pkgs/development/libraries/qwt/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/qwt/prefix.diff | 24 |
2 files changed, 4 insertions, 29 deletions
diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index aa4f45243e0..4aa7c0bc7d5 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -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''; diff --git a/pkgs/development/libraries/qwt/prefix.diff b/pkgs/development/libraries/qwt/prefix.diff deleted file mode 100644 index a97efe5ab4a..00000000000 --- a/pkgs/development/libraries/qwt/prefix.diff +++ /dev/null @@ -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 |