Unverified Commit 6d2926ff authored by Paul Haerle's avatar Paul Haerle Committed by GitHub
Browse files

oxidized: use defaultGemConfig (#441440)

parents 280d0970 6874e741

pkgs/by-name/ox/oxidized/package.nix

+2 −47
Original line number Diff line number Diff line
@@ -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;

pkgs/development/ruby-modules/gem-config/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -1039,6 +1039,7 @@ in 
      zlib

    ];

    dontUseCmakeConfigure = true;

    buildFlags = [ "--with-ssh" ];

  };



  sassc = attrs: {