Unverified Commit 8d3a6350 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

mariadb: fix client/server passthru with overrideAttrs (#417579)

parents 1e7b9d8a 11f61103

pkgs/servers/sql/mariadb/default.nix

+102 −100
Original line number Diff line number Diff line
@@ -256,8 +256,10 @@ let 
            '';

        }

      );

    in



      server = stdenv.mkDerivation (

    stdenv.mkDerivation (

      finalAttrs:

      common

      // {

        pname = "mariadb-server";
@@ -358,14 +360,14 @@ let 
          '';



        CXXFLAGS = lib.optionalString stdenv.hostPlatform.isi686 "-fpermissive";



        passthru = {

          inherit client;

          server = finalAttrs.finalPackage;

        };

      }

    );

in

    server

    // {

      inherit client server;

    };

in

self: {

  # see https://mariadb.org/about/#maintenance-policy for EOLs

  mariadb_106 = self.callPackage generic {