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

Merge pull request #44098 from alyssais/capybara-webkit

Browse Source 
gem-config: fix capybara-webkit on Darwin
This commit is contained in:
Jörg Thalheim 2018-08-16 15:31:37 +02:00 committed by GitHub
commit 8c044897dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/ruby-modules/gem-config/default.nix
View File

@ -22,7 +22,7 @@
, pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
, libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
, cairo, re2, rake, gobjectIntrospection, gdk_pixbuf, zeromq, graphicsmagick , cairo, re2, rake, gobjectIntrospection, gdk_pixbuf, zeromq, graphicsmagick, libcxx
}@args: }@args:
let let
@ -69,7 +69,8 @@ in
}; };
capybara-webkit = attrs: { capybara-webkit = attrs: {
buildInputs = [ qt48 ]; buildInputs = [ qt48 ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
}; };
charlock_holmes = attrs: { charlock_holmes = attrs: {