diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-02-22 10:43:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-11 16:17:56 +0000 |
| commit | ca1aada113c0ebda1ab8667199f6453f8e01c4fc (patch) | |
| tree | 55e402280096f62eb0bc8bcad5ce6050c5a0aec7 /nixpkgs/pkgs/development/libraries/qwt | |
| parent | e4df5a52a6a6531f32626f57205356a773ac2975 (diff) | |
| parent | 93883402a445ad467320925a0a5dbe43a949f25b (diff) | |
| download | nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.gz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.bz2 nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.lz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.xz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.zst nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.zip | |
Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'
Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/qwt')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/qwt/6.nix | 7 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/qwt/6.nix b/nixpkgs/pkgs/development/libraries/qwt/6.nix index 1f2518fc7380..a9fa29ba4d4f 100644 --- a/nixpkgs/pkgs/development/libraries/qwt/6.nix +++ b/nixpkgs/pkgs/development/libraries/qwt/6.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: stdenv.mkDerivation rec { - name = "qwt-6.1.6"; + pname = "qwt"; + version = "6.1.6"; src = fetchurl { - url = "mirror://sourceforge/qwt/${name}.tar.bz2"; + url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2"; sha256 = "sha256-mUYNMcEV7kEXsBddiF9HwsWQ14QgbwmBXcBY++Xt4fY="; }; @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri ''; - qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ]; + qmakeFlags = [ "-after doc.path=$out/share/doc/qwt-${version}" ]; dontWrapQtApps = true; diff --git a/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix b/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix index 61903af93fac..021fa0ba57d4 100644 --- a/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix +++ b/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, qt4, qmake4Hook, AGL }: stdenv.mkDerivation rec { - name = "qwt-6.1.5"; + pname = "qwt"; + version = "6.1.5"; src = fetchurl { - url = "mirror://sourceforge/qwt/${name}.tar.bz2"; + url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2"; sha256 = "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0"; }; @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { install_name_tool -id "$out/lib/qwt.framework/Versions/6/qwt" "$out/lib/qwt.framework/Versions/6/qwt" ''; - qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ]; + qmakeFlags = [ "-after doc.path=$out/share/doc/qwt-${version}" ]; meta = with lib; { description = "Qt widgets for technical applications"; |