pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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 ];
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user