From 89a09456c714de093d46d51f0c2b03cb61633f54 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 4 Mar 2020 18:04:36 +0000 Subject: [PATCH] Revert "defaultGemConfig: remove asciidoctor-diagram JARs" (#81737) This reverts commit 1ac11cc1c1858af1cef725d68cacf7102366e588. asciidoctor-diagram starts Java processes, so the JARs are necessary on all platforms. See https://github.com/NixOS/nixpkgs/pull/77149#issuecomment-594576339. --- pkgs/development/ruby-modules/gem-config/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index d68e1592d88..65f27f497b7 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -39,15 +39,6 @@ let in { - asciidoctor-diagram = { version, ruby, ... }: { - postInstall = '' - # Delete vendored JAR files unless using JRuby. - if ruby -e 'exit(RUBY_PLATFORM != "java")'; then - rm -v $out/${ruby.gemPath}/gems/$gemName-${version}/lib/*.jar - fi - ''; - }; - atk = attrs: { dependencies = attrs.dependencies ++ [ "gobject-introspection" ]; nativeBuildInputs = [ rake bundler pkgconfig ];