Skip to content

Commit

Permalink
qscreenshot: fix darwin build
Browse files Browse the repository at this point in the history
/cc ZHF #36454
  • Loading branch information
LnL7 committed Mar 24, 2018
1 parent f59a544 commit b5b77a6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
5 changes: 3 additions & 2 deletions pkgs/applications/graphics/qscreenshot/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, dos2unix, which, qt }:
{ stdenv, fetchurl, dos2unix, which, qt, Carbon }:

stdenv.mkDerivation rec {
name = "qscreenshot-1.0";
Expand All @@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1spj5fg2l8p5bk81xsv6hqn1kcrdiy54w19jsfb7g5i94vcb1pcx";
};

buildInputs = [ dos2unix which qt ];
buildInputs = [ dos2unix which qt ]
++ stdenv.lib.optional stdenv.isDarwin Carbon;

# Remove carriage returns that cause /bin/sh to abort
preConfigure = ''
Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17310,6 +17310,7 @@ with pkgs;
qsampler = libsForQt5.callPackage ../applications/audio/qsampler { };

qscreenshot = callPackage ../applications/graphics/qscreenshot {
inherit (darwin.apple_sdk.frameworks) Carbon;
qt = qt4;
};

Expand Down

0 comments on commit b5b77a6

Please sign in to comment.