diff options
Diffstat (limited to 'pkgs/development/ruby-modules')
-rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 40 | ||||
-rw-r--r-- | pkgs/development/ruby-modules/with-packages/Gemfile | 13 |
2 files changed, 20 insertions, 33 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 46340d5d2e23..3f91cdfebc85 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -19,7 +19,7 @@ { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick -, pkgconfig , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi +, pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl , msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx @@ -41,7 +41,7 @@ in { atk = attrs: { dependencies = attrs.dependencies ++ [ "gobject-introspection" ]; - nativeBuildInputs = [ rake bundler pkgconfig ]; + nativeBuildInputs = [ rake bundler pkg-config ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook atk ]; }; @@ -61,12 +61,12 @@ in }; cairo = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp]; }; cairo-gobject = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo pcre xorg.libpthreadstubs xorg.libXdmcp ]; }; @@ -75,7 +75,7 @@ in }; cld3 = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ protobuf ]; }; @@ -180,12 +180,12 @@ in }; ffi = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libffi ]; }; gdk_pixbuf2 = attrs: { - nativeBuildInputs = [ pkgconfig bundler rake ]; + nativeBuildInputs = [ pkg-config bundler rake ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gdk-pixbuf ]; }; @@ -195,7 +195,7 @@ in }; gio2 = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 pcre gobject-introspection ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ]; }; @@ -212,13 +212,13 @@ in }; glib2 = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 pcre ]; }; gtk2 = attrs: { nativeBuildInputs = [ - binutils pkgconfig + binutils pkg-config ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ]; @@ -238,12 +238,12 @@ in }; gobject-introspection = attrs: { - nativeBuildInputs = [ pkgconfig pcre ]; + nativeBuildInputs = [ pkg-config pcre ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook glib ]; }; grpc = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; hardeningDisable = [ "format" ]; NIX_CFLAGS_COMPILE = toString [ @@ -320,7 +320,7 @@ in cmake bison flex - pkgconfig + pkg-config python3 ]; @@ -418,7 +418,7 @@ in pango = attrs: { nativeBuildInputs = [ - pkgconfig + pkg-config fribidi harfbuzz pcre @@ -476,7 +476,7 @@ in }; rmagick = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ imagemagick which ]; }; @@ -485,7 +485,7 @@ in }; ruby-libvirt = attrs: { - buildInputs = [ libvirt pkgconfig ]; + buildInputs = [ libvirt pkg-config ]; buildFlags = [ "--with-libvirt-include=${libvirt}/include" "--with-libvirt-lib=${libvirt}/lib" @@ -520,8 +520,8 @@ in }; rugged = attrs: { - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which cmake openssl libssh2 zlib ]; + nativeBuildInputs = [ cmake pkg-config which ]; + buildInputs = [ openssl libssh2 zlib ]; dontUseCmakeConfigure = true; }; @@ -588,7 +588,7 @@ in }; tiny_tds = attrs: { - nativeBuildInputs = [ pkgconfig openssl ]; + nativeBuildInputs = [ pkg-config openssl ]; buildInputs = [ freetds ]; }; @@ -617,7 +617,7 @@ in xapian-ruby = attrs: { # use the system xapian dontBuild = false; - nativeBuildInputs = [ rake pkgconfig bundler ]; + nativeBuildInputs = [ rake pkg-config bundler ]; buildInputs = [ xapian zlib ]; postPatch = '' cp ${./xapian-Rakefile} Rakefile diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile index 3454ce3df74b..dda0f69c35cc 100644 --- a/pkgs/development/ruby-modules/with-packages/Gemfile +++ b/pkgs/development/ruby-modules/with-packages/Gemfile @@ -14,13 +14,9 @@ source 'https://rubygems.org' do gem 'cocoapods' gem 'cocoapods-acknowledgements' gem 'cocoapods-art' - gem 'cocoapods-bin' gem 'cocoapods-browser' - gem 'cocoapods-bugsnag' - gem 'cocoapods-check' gem 'cocoapods-clean' gem 'cocoapods-clean_build_phases_scripts' - gem 'cocoapods-core' gem 'cocoapods-coverage' gem 'cocoapods-deintegrate' gem 'cocoapods-dependencies' @@ -31,18 +27,9 @@ source 'https://rubygems.org' do gem 'cocoapods-generate' gem 'cocoapods-git_url_rewriter' gem 'cocoapods-keys' - gem 'cocoapods-no-dev-schemes' gem 'cocoapods-open' - gem 'cocoapods-packager' - gem 'cocoapods-playgrounds' gem 'cocoapods-plugins' - gem 'cocoapods-prune-localizations' - gem 'cocoapods-rome' gem 'cocoapods-search' - gem 'cocoapods-sorted-search' - gem 'cocoapods-static-swift-framework' - gem 'cocoapods-stats' - gem 'cocoapods-tdfire-binary' gem 'cocoapods-testing' gem 'cocoapods-trunk' gem 'cocoapods-try' |