Merge pull request #183716 from wegank/spice-gtk-darwin (bf7e9939) · Commits · nix / nixpkgs

pkgs/development/libraries/spice-gtk/default.nix

+18 −10

Original line number	Diff line number	Diff line
		{ lib, stdenv
		{ lib
		, stdenv
		, fetchurl
		, acl
		, cyrus_sasl
		@@ -33,7 +34,7 @@
		, vala
		, wayland-protocols
		, zlib
		, withPolkit ? true
		, withPolkit ? stdenv.isLinux
		}:

		# If this package is built with polkit support (withPolkit=true),
		@@ -59,13 +60,13 @@

		stdenv.mkDerivation rec {
		pname = "spice-gtk";
		version = "0.40";
		version = "0.41";

		outputs = [ "out" "dev" "devdoc" "man" ];

		src = fetchurl {
		url = "https://www.spice-space.org/download/gtk/${pname}-${version}.tar.xz";
		sha256 = "sha256-I/X/f6gLdWR85zzaXq+LMi80Mtu7f286g5Y0YYrbztM=";
		sha256 = "sha256-2Pi1y+qRhHAu64zCdqZ9cqzbbjbnxzNJ+4RF5byglp8=";
		};

		postPatch = ''
		@@ -95,7 +96,8 @@ stdenv.mkDerivation rec {
		];

		propagatedBuildInputs = [
		gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
		gst_all_1.gst-plugins-base
		gst_all_1.gst-plugins-good
		];

		buildInputs = [
		@@ -104,8 +106,6 @@ stdenv.mkDerivation rec {
		gtk3
		json-glib
		libcacard
		libcap_ng
		libdrm
		libjpeg_turbo
		libopus
		libusb1
		@@ -115,9 +115,15 @@ stdenv.mkDerivation rec {
		pixman
		spice-protocol
		usbredir
		wayland-protocols
		zlib
		] ++ lib.optionals withPolkit [ polkit acl ] ;
		] ++ lib.optionals withPolkit [
		polkit
		acl
		] ++ lib.optionals stdenv.isLinux [
		libcap_ng
		libdrm
		wayland-protocols
		];

		PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";

		@@ -126,6 +132,8 @@ stdenv.mkDerivation rec {
		"-Dusb-ids-path=${hwdata}/share/hwdata/usb.ids"
		] ++ lib.optionals (!withPolkit) [
		"-Dpolkit=disabled"
		] ++ lib.optionals (!stdenv.isLinux) [
		"-Dlibcap-ng=disabled"
		];

		meta = with lib; {
		@@ -140,6 +148,6 @@ stdenv.mkDerivation rec {
		homepage = "https://www.spice-space.org/";
		license = licenses.lgpl21;
		maintainers = [ maintainers.xeji ];
		platforms = platforms.linux;
		platforms = platforms.unix;
		};
		}

pkgs/development/libraries/usbredir/default.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
		homepage = "https://www.spice-space.org/usbredir.html";
		license = licenses.lgpl21Plus;
		maintainers = with maintainers; [ offline ];
		platforms = platforms.linux;
		platforms = platforms.unix;
		};
		}

pkgs/tools/networking/phodav/default.nix

+26 −5

Original line number	Diff line number	Diff line
		{ lib, stdenv, fetchurl
		, pkg-config, libsoup, meson, ninja }:
		{ lib
		, stdenv
		, fetchurl
		, fetchpatch
		, pkg-config
		, libsoup
		, meson
		, ninja
		}:

		let
		version = "2.5";
		in stdenv.mkDerivation rec {
		in
		stdenv.mkDerivation rec {
		pname = "phodav";
		inherit version;

		@@ -12,6 +20,17 @@ in stdenv.mkDerivation rec {
		sha256 = "045rdzf8isqmzix12lkz6z073b5qvcqq6ad028advm5gf36skw3i";
		};

		patches = [
		(fetchpatch {
		url = "https://gitlab.gnome.org/GNOME/phodav/-/commit/ae9ac98c1b3db26070111661aba02594c62d2cef.patch";
		sha256 = "sha256-jIHG6aRqG00Q6aIQsn4tyQdy/b6juW6QiUPXLmIc3TE=";
		})
		(fetchpatch {
		url = "https://gitlab.gnome.org/GNOME/phodav/-/commit/560ab5ca4f836d82bddbbe66ea0f7c6b4cab6b3b.patch";
		sha256 = "sha256-2gP579qhEkp7fQ8DBGYbZcjb2Tr+WpJs30Z7lsQaz2g=";
		})
		];

		mesonFlags = [
		"-Davahi=disabled"
		"-Dsystemd=disabled"
		@@ -19,6 +38,8 @@ in stdenv.mkDerivation rec {
		"-Dudev=disabled"
		];

		NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lintl";

		nativeBuildInputs = [ libsoup pkg-config meson ninja ];

		outputs = [ "out" "dev" "lib" ];
		@@ -27,7 +48,7 @@ in stdenv.mkDerivation rec {
		description = "WebDav server implementation and library using libsoup";
		homepage = "https://wiki.gnome.org/phodav";
		license = licenses.lgpl21;
		maintainers = with maintainers; [ ];
		platforms = platforms.linux;
		maintainers = with maintainers; [ wegank ];
		platforms = platforms.unix;
		};
		}

Admin message