···122122 done
123123124124 if test -d ${pkg}/share/xsessions; then
125125- ${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
125125+ ${pkgs.buildPackages.xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
126126 fi
127127 if test -d ${pkg}/share/wayland-sessions; then
128128- ${xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions
128128+ ${pkgs.buildPackages.xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions
129129 fi
130130 '') cfg.displayManager.sessionPackages}
131131 '';
···11+{ lib, stdenv
22+, build2
33+, fetchurl
44+, libodb
55+, sqlite
66+, enableShared ? !stdenv.hostPlatform.isStatic
77+, enableStatic ? !enableShared
88+}:
99+stdenv.mkDerivation rec {
1010+ pname = "libodb-sqlite";
1111+ version = "2.5.0-b.19";
1212+1313+ outputs = [ "out" "dev" "doc" ];
1414+1515+ src = fetchurl {
1616+ url = "https://pkg.cppget.org/1/beta/odb/libodb-sqlite-${version}.tar.gz";
1717+ sha256 = "9443653bfc31d02d0d723f18072f6b04083d090e6580844e33c1e769db122494";
1818+ };
1919+2020+ nativeBuildInputs = [
2121+ build2
2222+ ];
2323+ buildInputs = [
2424+ libodb
2525+ ];
2626+ propagatedBuildInputs = [
2727+ sqlite
2828+ ];
2929+3030+ build2ConfigureFlags = [
3131+ "config.bin.lib=${build2.configSharedStatic enableShared enableStatic}"
3232+ ];
3333+3434+ doCheck = true;
3535+3636+ meta = with lib; {
3737+ description = "SQLite ODB runtime library";
3838+ longDescription = ''
3939+ ODB is an object-relational mapping (ORM) system for C++. It provides
4040+ tools, APIs, and library support that allow you to persist C++ objects
4141+ to a relational database (RDBMS) without having to deal with tables,
4242+ columns, or SQL and without manually writing any of the mapping code.
4343+ For more information see:
4444+4545+ http://www.codesynthesis.com/products/odb/
4646+4747+ This package contains the SQLite ODB runtime library. Every application
4848+ that includes code generated for the SQLite database will need to link
4949+ to this library.
5050+ '';
5151+ homepage = "https://www.codesynthesis.com/products/odb/";
5252+ changelog = "https://git.codesynthesis.com/cgit/odb/libodb-sqlite/tree/NEWS";
5353+ license = licenses.gpl2Only;
5454+ maintainers = with maintainers; [ r-burns ];
5555+ };
5656+}
+45
pkgs/development/libraries/libodb/default.nix
···11+{ lib, stdenv
22+, build2
33+, fetchurl
44+, enableShared ? !stdenv.hostPlatform.isStatic
55+, enableStatic ? !enableShared
66+}:
77+stdenv.mkDerivation rec {
88+ pname = "libodb";
99+ version = "2.5.0-b.19";
1010+1111+ outputs = [ "out" "dev" "doc" ];
1212+1313+ src = fetchurl {
1414+ url = "https://pkg.cppget.org/1/beta/odb/libodb-${version}.tar.gz";
1515+ sha256 = "8180d9d40d8e74ed25b1712953f19379a29abdee3896ae98ba9ade35846adb39";
1616+ };
1717+1818+ nativeBuildInputs = [ build2 ];
1919+ build2ConfigureFlags = [
2020+ "config.bin.lib=${build2.configSharedStatic enableShared enableStatic}"
2121+ ];
2222+2323+ doCheck = true;
2424+2525+ meta = with lib; {
2626+ description = "Common ODB runtime library";
2727+ longDescription = ''
2828+ ODB is an object-relational mapping (ORM) system for C++. It provides
2929+ tools, APIs, and library support that allow you to persist C++ objects
3030+ to a relational database (RDBMS) without having to deal with tables,
3131+ columns, or SQL and without manually writing any of the mapping code.
3232+ For more information see:
3333+3434+ http://www.codesynthesis.com/products/odb/
3535+3636+ This package contains the common ODB runtime library. Every application
3737+ that includes code generated by the ODB compiler will need to link to
3838+ this library.
3939+ '';
4040+ homepage = "https://www.codesynthesis.com/products/odb/";
4141+ changelog = "https://git.codesynthesis.com/cgit/odb/libodb/tree/NEWS";
4242+ license = licenses.gpl2Only;
4343+ maintainers = with maintainers; [ r-burns ];
4444+ };
4545+}
+3
pkgs/development/libraries/mtxclient/default.nix
···2121 sha256 = "sha256-UKroV1p7jYuNzCAFMsuUsYC/C9AZ1D4rhwpwuER39vc=";
2222 };
23232424+ # This patch should be obsolete and should stop applying the in next release.
2525+ patches = [ ./fix-compilation-with-olm-3.2.5.patch ];
2626+2427 cmakeFlags = [
2528 # Network requiring tests can't be disabled individually:
2629 # https://github.com/Nheko-Reborn/mtxclient/issues/22