public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

qmltermwidget: add missing utmp lib on darwin
This commit is contained in:
Renaud 2018-12-06 22:52:50 +01:00 committed by GitHub
parent cc8deff2d4 5205aaa655
commit 61bb42b990
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/qmltermwidget/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia }: { stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.1.0"; version = "0.1.0";
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3"; sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3";
}; };
buildInputs = [ qtbase qtquick1 qtmultimedia ]; buildInputs = [ qtbase qtquick1 qtmultimedia ]
++ stdenv.lib.optional stdenv.isDarwin utmp;
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
patchPhase = '' patchPhase = ''
@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
description = "A QML port of qtermwidget"; description = "A QML port of qtermwidget";
homepage = https://github.com/Swordfish90/qmltermwidget; homepage = https://github.com/Swordfish90/qmltermwidget;
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux; platforms = with stdenv.lib.platforms; linux ++ darwin;
maintainers = with stdenv.lib.maintainers; [ skeidel ]; maintainers = with stdenv.lib.maintainers; [ skeidel ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -12126,7 +12126,9 @@ in
qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; 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 { }; qmlbox2d = libsForQt59.callPackage ../development/libraries/qmlbox2d { };
qscintilla = callPackage ../development/libraries/qscintilla { qscintilla = callPackage ../development/libraries/qscintilla {