diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-03-24 14:26:30 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-03-24 14:26:30 +0100 |
| commit | b5b77a688683441a36edf18df2278fba160e17e0 (patch) | |
| tree | e0671b07ca8dcebfa1e8c12e050cf591a885de04 | |
| parent | f59a544bf1db7141c9686bc65edc201582388d37 (diff) | |
| download | nixpkgs-b5b77a688683441a36edf18df2278fba160e17e0.tar nixpkgs-b5b77a688683441a36edf18df2278fba160e17e0.tar.gz nixpkgs-b5b77a688683441a36edf18df2278fba160e17e0.tar.bz2 nixpkgs-b5b77a688683441a36edf18df2278fba160e17e0.tar.lz nixpkgs-b5b77a688683441a36edf18df2278fba160e17e0.tar.xz nixpkgs-b5b77a688683441a36edf18df2278fba160e17e0.tar.zst nixpkgs-b5b77a688683441a36edf18df2278fba160e17e0.zip | |
qscreenshot: fix darwin build
/cc ZHF #36454
| -rw-r--r-- | pkgs/applications/graphics/qscreenshot/default.nix | 5 | ||||
| -rw-r--r-- | 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 c4f4f6472ed..fafc76a76ff 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 96d3ecee2c7..a515c543a91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |