Unverified Commit 11f61103 authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

mariadb: fix client/server passthru with overrideAttrs 

Any attribute concatenation onto the result of mkDerivation will break
overrideability.

In this case, `(mariadb.overrideAttrs { }).client` will complain,
because `client` is not available, anymore.

This commit fixes that. `.server` will be what you expect after the
override, while `.client` will just expose the un-overriden client as
before. Making the `overrideAttrs` also affect the client in a sensible
well is unfortunately not easily done. At all.
parent afd88641

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 {