movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

gupnp_1_6: Unbreak on Darwin (#408126)

Browse source
This commit is contained in:
Jörg Thalheim 2025-05-19 11:47:00 +02:00 • committed by GitHub
commit 8831cf6df6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/libraries/gssdp/1.6.nix
View file

@ -17,7 +17,7 @@
gssdp-tools, gssdp-tools,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "gssdp"; pname = "gssdp";
version = "1.6.3"; version = "1.6.3";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
]; ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor finalAttrs.version}/gssdp-${finalAttrs.version}.tar.xz";
sha256 = "L+21r9sizxTVSYo5p3PKiXiKJQ/PcBGHg9+CHh8/NEY="; sha256 = "L+21r9sizxTVSYo5p3PKiXiKJQ/PcBGHg9+CHh8/NEY=";
}; };
@ -60,7 +60,8 @@ stdenv.mkDerivation rec {
(lib.mesonBool "manpages" enableManpages) (lib.mesonBool "manpages" enableManpages)
]; ];
doCheck = true; # On Darwin: Failed to bind socket, Operation not permitted
doCheck = !stdenv.hostPlatform.isDarwin;
postFixup = '' postFixup = ''
# Move developer documentation to devdoc output. # Move developer documentation to devdoc output.
@ -74,7 +75,7 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
attrPath = "gssdp_1_6"; attrPath = "gssdp_1_6";
packageName = pname; packageName = "gssdp";
}; };
tests = { tests = {
@ -83,11 +84,10 @@ stdenv.mkDerivation rec {
}; };
meta = with lib; { meta = with lib; {
broken = stdenv.hostPlatform.isDarwin;
description = "GObject-based API for handling resource discovery and announcement over SSDP"; description = "GObject-based API for handling resource discovery and announcement over SSDP";
homepage = "http://www.gupnp.org/"; homepage = "http://www.gupnp.org/";
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
teams = [ teams.gnome ]; teams = [ teams.gnome ];
platforms = platforms.all; platforms = platforms.all;
}; };
} })

13
pkgs/development/libraries/gupnp/1.6.nix
View file

@ -15,7 +15,7 @@
gnome, gnome,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "gupnp"; pname = "gupnp";
version = "1.6.8"; version = "1.6.8";
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
]; ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor finalAttrs.version}/gupnp-${finalAttrs.version}.tar.xz";
hash = "sha256-cKADzr1oV3KT+z5q9J/5AiA7+HaLL8XWUd3B8PoeEek="; hash = "sha256-cKADzr1oV3KT+z5q9J/5AiA7+HaLL8XWUd3B8PoeEek=";
}; };
@ -54,7 +54,8 @@ stdenv.mkDerivation rec {
"-Dgtk_doc=true" "-Dgtk_doc=true"
]; ];
doCheck = true; # On Darwin: Failed to bind socket, Operation not permitted
doCheck = !stdenv.hostPlatform.isDarwin;
postFixup = '' postFixup = ''
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
@ -64,7 +65,7 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
attrPath = "gupnp_1_6"; attrPath = "gupnp_1_6";
packageName = pname; packageName = "gupnp";
}; };
}; };
@ -73,6 +74,6 @@ stdenv.mkDerivation rec {
description = "Implementation of the UPnP specification"; description = "Implementation of the UPnP specification";
mainProgram = "gupnp-binding-tool-1.6"; mainProgram = "gupnp-binding-tool-1.6";
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} })