Permalink
Browse files

Merge pull request #51572 from georgewhewell/qmltermwidget-fix-darwin

qmltermwidget: add missing utmp lib on darwin
  • Loading branch information...
c0bw3b committed Dec 6, 2018
2 parents cc8deff + 5205aaa commit 61bb42b990437022c3bfe324c9b3be983e3a450b
Showing with 7 additions and 4 deletions.
  1. +4 −3 pkgs/development/libraries/qmltermwidget/default.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia }:
{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }:

stdenv.mkDerivation rec {
version = "0.1.0";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3";
};

buildInputs = [ qtbase qtquick1 qtmultimedia ];
buildInputs = [ qtbase qtquick1 qtmultimedia ]
++ stdenv.lib.optional stdenv.isDarwin utmp;
nativeBuildInputs = [ qmake ];

patchPhase = ''
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
description = "A QML port of qtermwidget";
homepage = https://github.com/Swordfish90/qmltermwidget;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
platforms = with stdenv.lib.platforms; linux ++ darwin;
maintainers = with stdenv.lib.maintainers; [ skeidel ];
};
}
@@ -12126,7 +12126,9 @@ in

qca-qt5 = callPackage ../development/libraries/qca-qt5 { };

qmltermwidget = callPackage ../development/libraries/qmltermwidget { };
qmltermwidget = callPackage ../development/libraries/qmltermwidget {
inherit (darwin.apple_sdk.libs) utmp;
};
qmlbox2d = libsForQt59.callPackage ../development/libraries/qmlbox2d { };

qscintilla = callPackage ../development/libraries/qscintilla {

0 comments on commit 61bb42b

Please sign in to comment.