From 2a57fc65b0f21c10184095a1ae251b1e882dfc5b Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 24 Mar 2018 14:26:30 +0100 Subject: [PATCH] qscreenshot: fix darwin build /cc ZHF #36454 (cherry picked from commit b5b77a688683441a36edf18df2278fba160e17e0) --- pkgs/applications/graphics/qscreenshot/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix index c4f4f6472ed67..fafc76a76ffeb 100644 --- a/pkgs/applications/graphics/qscreenshot/default.nix +++ b/pkgs/applications/graphics/qscreenshot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dos2unix, which, qt }: +{ stdenv, fetchurl, dos2unix, which, qt, Carbon }: stdenv.mkDerivation rec { name = "qscreenshot-1.0"; @@ -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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a285a5149a285..480d5de5ffd50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17207,6 +17207,7 @@ with pkgs; qsampler = libsForQt5.callPackage ../applications/audio/qsampler { }; qscreenshot = callPackage ../applications/graphics/qscreenshot { + inherit (darwin.apple_sdk.frameworks) Carbon; qt = qt4; };