diff --git a/pkgs/by-name/ox/oxidized/package.nix b/pkgs/by-name/ox/oxidized/package.nix index 046add730c65..78ab4a5998c2 100644 --- a/pkgs/by-name/ox/oxidized/package.nix +++ b/pkgs/by-name/ox/oxidized/package.nix @@ -3,17 +3,8 @@ ruby, bundlerApp, bundlerUpdateScript, + defaultGemConfig, nixosTests, - libssh2, - pkg-config, - openssl, - cmake, - libgit2, - icu, - which, - file, - zlib, - libyaml, }: bundlerApp { @@ -27,43 +18,7 @@ bundlerApp { "oxs" ]; - gemConfig = { - rugged = attrs: { - buildInputs = [ - pkg-config - cmake - ]; - nativeBuildInputs = [ - pkg-config - cmake - ]; - propagatedBuildInputs = [ - libssh2 - openssl - libgit2 - ]; - - dontUseCmakeConfigure = true; - buildFlags = [ "--with-ssh" ]; - }; - - charlock_holmes = attrs: { - buildInputs = [ - icu - zlib - ]; - nativeBuildInputs = [ - which - pkg-config - file - ]; - }; - - psych = attrs: { - buildInputs = [ libyaml ]; - nativeBuildInputs = [ pkg-config ]; - }; - }; + gemConfig = defaultGemConfig; passthru = { tests = nixosTests.oxidized; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index e746c32fe896..c4adafb51c8e 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -1039,6 +1039,7 @@ in zlib ]; dontUseCmakeConfigure = true; + buildFlags = [ "--with-ssh" ]; }; sassc = attrs: {