diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-22 00:00:13 +0700 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-01-21 19:11:02 -0800 |
commit | 66e44425c6dfecbea68a5d6dc221ccd56561d4f1 (patch) | |
tree | 0a5bf7d41356ad47b4e6f0a737bf16c9a4a5b01e /pkgs/development/libraries/qwt | |
parent | 046d24424ef32cca1227519f93f41b5ec8133f31 (diff) | |
download | nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.gz nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.bz2 nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.lz nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.xz nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.zst nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.zip |
pkgs/development/libraries: stdenv.lib -> lib
Diffstat (limited to 'pkgs/development/libraries/qwt')
-rw-r--r-- | pkgs/development/libraries/qwt/6.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/qwt/6_qt4.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/qwt/default.nix | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index 1a29bb90fbb..edfd3b4e24a 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: +{ lib, stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: stdenv.mkDerivation rec { name = "qwt-6.1.5"; @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt widgets for technical applications"; homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) - license = stdenv.lib.licenses.qwt; + license = lib.licenses.qwt; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; branch = "6"; diff --git a/pkgs/development/libraries/qwt/6_qt4.nix b/pkgs/development/libraries/qwt/6_qt4.nix index 4b7aa9cf7f9..61903af93fa 100644 --- a/pkgs/development/libraries/qwt/6_qt4.nix +++ b/pkgs/development/libraries/qwt/6_qt4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, AGL }: +{ lib, stdenv, fetchurl, qt4, qmake4Hook, AGL }: stdenv.mkDerivation rec { name = "qwt-6.1.5"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ AGL ]; + ] ++ lib.optionals stdenv.isDarwin [ AGL ]; nativeBuildInputs = [ qmake4Hook ]; @@ -22,18 +22,18 @@ stdenv.mkDerivation rec { # qwt.framework output includes a relative reference to itself, which breaks dependents preFixup = - stdenv.lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.isDarwin '' echo "Attempting to repair qwt" 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}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt widgets for technical applications"; homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) - license = stdenv.lib.licenses.qwt; + license = lib.licenses.qwt; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; branch = "6"; diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index c206ffdd5db..e158fe34885 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ lib, stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "qwt-5.2.3"; @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { qmakeFlags="$qmakeFlags INSTALLBASE=$out -after doc.path=$out/share/doc/${name}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt widgets for technical applications"; homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) - license = stdenv.lib.licenses.qwt; + license = lib.licenses.qwt; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; |