diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-30 13:30:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-31 10:13:20 +0000 |
| commit | f2e61678de300336b3666afd19af7565efb0c4cf (patch) | |
| tree | 49f6906c9d557f7fdd58257ff85ec17fc4495f31 /nixpkgs/pkgs/development/libraries/qwt/default.nix | |
| parent | f920d5e07c29a9aa1b77d9b88bd604cf1a1f3664 (diff) | |
| parent | 00e27c78d3d2de6964096ceee8d70e5b487365e3 (diff) | |
| download | nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.gz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.bz2 nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.lz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.xz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.zst nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.zip | |
Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3'
Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/qwt/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/qwt/default.nix | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/libraries/qwt/default.nix b/nixpkgs/pkgs/development/libraries/qwt/default.nix index a5dcfedb8491..46cfc426efa4 100644 --- a/nixpkgs/pkgs/development/libraries/qwt/default.nix +++ b/nixpkgs/pkgs/development/libraries/qwt/default.nix @@ -1,25 +1,24 @@ -{ lib, stdenv, fetchurl, qt4, qmake4Hook }: +{ lib, stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: stdenv.mkDerivation rec { pname = "qwt"; - version = "5.2.3"; + version = "6.2.0"; src = fetchurl { - url = "mirror://sourceforge/qwt/${pname}-${version}.tar.bz2"; - sha256 = "1dqa096mm6n3bidfq2b67nmdsvsw4ndzzd1qhl6hn8skcwqazzip"; + url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2"; + sha256 = "sha256-kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA="; }; - propagatedBuildInputs = [ qt4 ]; - nativeBuildInputs = [ qmake4Hook ]; + propagatedBuildInputs = [ qtbase qtsvg qttools ]; + nativeBuildInputs = [ qmake ]; 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 + sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri ''; - preConfigure = '' - qmakeFlags="$qmakeFlags INSTALLBASE=$out -after doc.path=$out/share/doc/${pname}-${version}" - ''; + qmakeFlags = [ "-after doc.path=$out/share/doc/qwt-${version}" ]; + + dontWrapQtApps = true; meta = with lib; { description = "Qt widgets for technical applications"; |