mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-09 05:58:34 +03:00
Merge pull request #183716 from wegank/spice-gtk-darwin
This commit is contained in:
commit
bf7e9939da
@ -1,4 +1,5 @@
|
|||||||
{ lib, stdenv
|
{ lib
|
||||||
|
, stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, acl
|
, acl
|
||||||
, cyrus_sasl
|
, cyrus_sasl
|
||||||
@ -33,7 +34,7 @@
|
|||||||
, vala
|
, vala
|
||||||
, wayland-protocols
|
, wayland-protocols
|
||||||
, zlib
|
, zlib
|
||||||
, withPolkit ? true
|
, withPolkit ? stdenv.isLinux
|
||||||
}:
|
}:
|
||||||
|
|
||||||
# If this package is built with polkit support (withPolkit=true),
|
# If this package is built with polkit support (withPolkit=true),
|
||||||
@ -59,13 +60,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "spice-gtk";
|
pname = "spice-gtk";
|
||||||
version = "0.40";
|
version = "0.41";
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" "man" ];
|
outputs = [ "out" "dev" "devdoc" "man" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.spice-space.org/download/gtk/${pname}-${version}.tar.xz";
|
url = "https://www.spice-space.org/download/gtk/${pname}-${version}.tar.xz";
|
||||||
sha256 = "sha256-I/X/f6gLdWR85zzaXq+LMi80Mtu7f286g5Y0YYrbztM=";
|
sha256 = "sha256-2Pi1y+qRhHAu64zCdqZ9cqzbbjbnxzNJ+4RF5byglp8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
@ -95,7 +96,8 @@ stdenv.mkDerivation rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
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 = [
|
buildInputs = [
|
||||||
@ -104,8 +106,6 @@ stdenv.mkDerivation rec {
|
|||||||
gtk3
|
gtk3
|
||||||
json-glib
|
json-glib
|
||||||
libcacard
|
libcacard
|
||||||
libcap_ng
|
|
||||||
libdrm
|
|
||||||
libjpeg_turbo
|
libjpeg_turbo
|
||||||
libopus
|
libopus
|
||||||
libusb1
|
libusb1
|
||||||
@ -115,9 +115,15 @@ stdenv.mkDerivation rec {
|
|||||||
pixman
|
pixman
|
||||||
spice-protocol
|
spice-protocol
|
||||||
usbredir
|
usbredir
|
||||||
wayland-protocols
|
|
||||||
zlib
|
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";
|
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"
|
"-Dusb-ids-path=${hwdata}/share/hwdata/usb.ids"
|
||||||
] ++ lib.optionals (!withPolkit) [
|
] ++ lib.optionals (!withPolkit) [
|
||||||
"-Dpolkit=disabled"
|
"-Dpolkit=disabled"
|
||||||
|
] ++ lib.optionals (!stdenv.isLinux) [
|
||||||
|
"-Dlibcap-ng=disabled"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
@ -140,6 +148,6 @@ stdenv.mkDerivation rec {
|
|||||||
homepage = "https://www.spice-space.org/";
|
homepage = "https://www.spice-space.org/";
|
||||||
license = licenses.lgpl21;
|
license = licenses.lgpl21;
|
||||||
maintainers = [ maintainers.xeji ];
|
maintainers = [ maintainers.xeji ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
|
|||||||
homepage = "https://www.spice-space.org/usbredir.html";
|
homepage = "https://www.spice-space.org/usbredir.html";
|
||||||
license = licenses.lgpl21Plus;
|
license = licenses.lgpl21Plus;
|
||||||
maintainers = with maintainers; [ offline ];
|
maintainers = with maintainers; [ offline ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,17 @@
|
|||||||
{ lib, stdenv, fetchurl
|
{ lib
|
||||||
, pkg-config, libsoup, meson, ninja }:
|
, stdenv
|
||||||
|
, fetchurl
|
||||||
|
, fetchpatch
|
||||||
|
, pkg-config
|
||||||
|
, libsoup
|
||||||
|
, meson
|
||||||
|
, ninja
|
||||||
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "2.5";
|
version = "2.5";
|
||||||
in stdenv.mkDerivation rec {
|
in
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
pname = "phodav";
|
pname = "phodav";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
@ -12,6 +20,17 @@ in stdenv.mkDerivation rec {
|
|||||||
sha256 = "045rdzf8isqmzix12lkz6z073b5qvcqq6ad028advm5gf36skw3i";
|
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 = [
|
mesonFlags = [
|
||||||
"-Davahi=disabled"
|
"-Davahi=disabled"
|
||||||
"-Dsystemd=disabled"
|
"-Dsystemd=disabled"
|
||||||
@ -19,6 +38,8 @@ in stdenv.mkDerivation rec {
|
|||||||
"-Dudev=disabled"
|
"-Dudev=disabled"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lintl";
|
||||||
|
|
||||||
nativeBuildInputs = [ libsoup pkg-config meson ninja ];
|
nativeBuildInputs = [ libsoup pkg-config meson ninja ];
|
||||||
|
|
||||||
outputs = [ "out" "dev" "lib" ];
|
outputs = [ "out" "dev" "lib" ];
|
||||||
@ -27,7 +48,7 @@ in stdenv.mkDerivation rec {
|
|||||||
description = "WebDav server implementation and library using libsoup";
|
description = "WebDav server implementation and library using libsoup";
|
||||||
homepage = "https://wiki.gnome.org/phodav";
|
homepage = "https://wiki.gnome.org/phodav";
|
||||||
license = licenses.lgpl21;
|
license = licenses.lgpl21;
|
||||||
maintainers = with maintainers; [ ];
|
maintainers = with maintainers; [ wegank ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user