diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-31 00:16:31 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-31 00:16:31 +0100 |
commit | 5cc0468a206c93ff246605a18eff562619d5a3b7 (patch) | |
tree | b845e8566f5f895d9b4fe451bb40e5a816670de7 /pkgs/servers | |
parent | 035bbb336aecc791ba3917f39653e7b6fa00036b (diff) | |
parent | 1a3a0e818144629b6b3dd8fbe174dc867aabdbf1 (diff) |
Merge staging into staging-next
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 5 | ||||
-rw-r--r-- | pkgs/servers/pulseaudio/qpaeq.nix | 54 | ||||
-rw-r--r-- | pkgs/servers/samba/4.x.nix | 18 |
3 files changed, 68 insertions, 9 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index da201765e55e0..49909510d2eda 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -108,7 +108,10 @@ stdenv.mkDerivation rec { rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}} sed 's|-lltdl|-L${libtool.lib}/lib -lltdl|' -i $out/lib/pulseaudio/libpulsecore-${version}.la '' - + ''moveToOutput lib/cmake "$dev" ''; + + '' + moveToOutput lib/cmake "$dev" + rm -f $out/bin/qpaeq # this is packaged by the "qpaeq" package now, because of missing deps + ''; preFixup = lib.optionalString stdenv.isLinux '' wrapProgram $out/libexec/pulse/gsettings-helper \ diff --git a/pkgs/servers/pulseaudio/qpaeq.nix b/pkgs/servers/pulseaudio/qpaeq.nix new file mode 100644 index 0000000000000..c84cc29f65283 --- /dev/null +++ b/pkgs/servers/pulseaudio/qpaeq.nix @@ -0,0 +1,54 @@ +{ mkDerivation +, makeDesktopItem +, python3 +, fetchurl +, lib +, pulseaudio +}: + +let + desktopItem = makeDesktopItem { + name = "qpaeq"; + exec = "@out@/bin/qpaeq"; + icon = "audio-volume-high"; + desktopName = "qpaeq"; + genericName = "Audio equalizer"; + categories = "Music;Sound;"; + startupNotify = "false"; + }; +in +mkDerivation rec { + pname = "qpaeq"; + inherit (pulseaudio) version src; + + buildInputs = [ + ((python3.withPackages (ps: with ps; [ + pyqt5 + dbus-python + ]))) + ]; + + dontBuild = true; + dontConfigure = true; + + installPhase = '' + runHook preInstall + install -D ./src/utils/qpaeq $out/bin/qpaeq + install -D ${desktopItem}/share/applications/qpaeq.desktop $out/share/applications/qpaeq.desktop + runHook postInstall + ''; + + preFixup = '' + sed "s|,sip|,PyQt5.sip|g" -i $out/bin/qpaeq + wrapQtApp $out/bin/qpaeq + sed "s|@out@|$out|g" -i $out/share/applications/qpaeq.desktop + ''; + + meta = { + description = "An equalizer interface for pulseaudio's equalizer sinks"; + homepage = http://www.pulseaudio.org/; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ lovek323 mkg20001 ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index c7ee15bc9f867..27139ed846c1a 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen +{ lib, stdenv, fetchurl, fetchpatch, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen , fixDarwinDylibNames , docbook_xml_dtd_42, readline , popt, iniparser, libbsd, libarchive, libiconv, gettext @@ -20,11 +20,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.10.11"; + version = "4.11.5"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "157qvz8x2s7994rzxhcmpc79cfk86zc0rq5qwg8alvjcw0r457v0"; + sha256 = "0gyr773dl0krcra6pvyp8i9adj3r16ihrrm2b71c0974cbzrkqpk"; }; outputs = [ "out" "dev" "man" ]; @@ -34,6 +34,11 @@ stdenv.mkDerivation rec { ./patch-source3__libads__kerberos_keytab.c.patch ./4.x-no-persistent-install-dynconfig.patch ./4.x-fix-makeflags-parsing.patch + (fetchpatch { + name = "test-oLschema2ldif-fmemopen.patch"; + url = "https://gitlab.com/samba-team/samba/commit/5e517e57c9d4d35e1042a49d3592652b05f0c45b.patch"; + sha256 = "1bbldf794svsdvcbp649imghmj0jck7545d3k9xs953qkkgwkbxi"; + }) ]; nativeBuildInputs = optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ]; @@ -41,12 +46,12 @@ stdenv.mkDerivation rec { buildInputs = [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /* docbook_xml_dtd_45 */ readline popt iniparser jansson - libbsd libarchive zlib fam libiconv gettext libunwind krb5Full + libbsd libarchive zlib fam libiconv gettext libunwind krb5Full gnutls ] ++ optionals stdenv.isLinux [ libaio systemd ] ++ optional enableLDAP openldap ++ optional (enablePrinting && stdenv.isLinux) cups ++ optional enableMDNS avahi - ++ optionals enableDomainController [ gnutls gpgme lmdb ] + ++ optionals enableDomainController [ gpgme lmdb ] ++ optional enableRegedit ncurses ++ optional (enableCephFS && stdenv.isLinux) libceph ++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ] @@ -61,9 +66,6 @@ stdenv.mkDerivation rec { sed -i "s,\(XML_CATALOG_FILES=\"\),\1$XML_CATALOG_FILES ,g" buildtools/wafsamba/wafsamba.py patchShebangs ./buildtools/bin - '' + optionalString stdenv.isDarwin '' - substituteInPlace libcli/dns/wscript_build \ - --replace "bld.SAMBA_BINARY('resolvconftest'" "True or bld.SAMBA_BINARY('resolvconftest'" ''; configureFlags = [ |