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

qscreenshot: fix darwin build

Browse Source 
/cc ZHF #36454
This commit is contained in:
Daiderd Jordan 2018-03-24 14:26:30 +01:00
parent f59a544bf1
commit b5b77a6886
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/graphics/qscreenshot/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, dos2unix, which, qt }: { stdenv, fetchurl, dos2unix, which, qt, Carbon }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qscreenshot-1.0"; name = "qscreenshot-1.0";
@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1spj5fg2l8p5bk81xsv6hqn1kcrdiy54w19jsfb7g5i94vcb1pcx"; 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 # Remove carriage returns that cause /bin/sh to abort
preConfigure = '' preConfigure = ''

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

@ -17310,6 +17310,7 @@ with pkgs;
qsampler = libsForQt5.callPackage ../applications/audio/qsampler { }; qsampler = libsForQt5.callPackage ../applications/audio/qsampler { };
qscreenshot = callPackage ../applications/graphics/qscreenshot { qscreenshot = callPackage ../applications/graphics/qscreenshot {
inherit (darwin.apple_sdk.frameworks) Carbon;
qt = qt4; qt = qt4;
}; };