Skip to content

Commit 8831cf6

Browse files
authored
gupnp_1_6: Unbreak on Darwin (#408126)
2 parents 6562341 + 96aca75 commit 8831cf6

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

pkgs/development/libraries/gssdp/1.6.nix

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
gssdp-tools,
1818
}:
1919

20-
stdenv.mkDerivation rec {
20+
stdenv.mkDerivation (finalAttrs: {
2121
pname = "gssdp";
2222
version = "1.6.3";
2323

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828
];
2929

3030
src = fetchurl {
31-
url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
31+
url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor finalAttrs.version}/gssdp-${finalAttrs.version}.tar.xz";
3232
sha256 = "L+21r9sizxTVSYo5p3PKiXiKJQ/PcBGHg9+CHh8/NEY=";
3333
};
3434

@@ -60,7 +60,8 @@ stdenv.mkDerivation rec {
6060
(lib.mesonBool "manpages" enableManpages)
6161
];
6262

63-
doCheck = true;
63+
# On Darwin: Failed to bind socket, Operation not permitted
64+
doCheck = !stdenv.hostPlatform.isDarwin;
6465

6566
postFixup = ''
6667
# Move developer documentation to devdoc output.
@@ -74,7 +75,7 @@ stdenv.mkDerivation rec {
7475
passthru = {
7576
updateScript = gnome.updateScript {
7677
attrPath = "gssdp_1_6";
77-
packageName = pname;
78+
packageName = "gssdp";
7879
};
7980

8081
tests = {
@@ -83,11 +84,10 @@ stdenv.mkDerivation rec {
8384
};
8485

8586
meta = with lib; {
86-
broken = stdenv.hostPlatform.isDarwin;
8787
description = "GObject-based API for handling resource discovery and announcement over SSDP";
8888
homepage = "http://www.gupnp.org/";
8989
license = licenses.lgpl2Plus;
9090
teams = [ teams.gnome ];
9191
platforms = platforms.all;
9292
};
93-
}
93+
})

pkgs/development/libraries/gupnp/1.6.nix

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
gnome,
1616
}:
1717

18-
stdenv.mkDerivation rec {
18+
stdenv.mkDerivation (finalAttrs: {
1919
pname = "gupnp";
2020
version = "1.6.8";
2121

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626
];
2727

2828
src = fetchurl {
29-
url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
29+
url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor finalAttrs.version}/gupnp-${finalAttrs.version}.tar.xz";
3030
hash = "sha256-cKADzr1oV3KT+z5q9J/5AiA7+HaLL8XWUd3B8PoeEek=";
3131
};
3232

@@ -54,7 +54,8 @@ stdenv.mkDerivation rec {
5454
"-Dgtk_doc=true"
5555
];
5656

57-
doCheck = true;
57+
# On Darwin: Failed to bind socket, Operation not permitted
58+
doCheck = !stdenv.hostPlatform.isDarwin;
5859

5960
postFixup = ''
6061
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
@@ -64,7 +65,7 @@ stdenv.mkDerivation rec {
6465
passthru = {
6566
updateScript = gnome.updateScript {
6667
attrPath = "gupnp_1_6";
67-
packageName = pname;
68+
packageName = "gupnp";
6869
};
6970
};
7071

@@ -73,6 +74,6 @@ stdenv.mkDerivation rec {
7374
description = "Implementation of the UPnP specification";
7475
mainProgram = "gupnp-binding-tool-1.6";
7576
license = licenses.lgpl2Plus;
76-
platforms = platforms.linux;
77+
platforms = platforms.unix;
7778
};
78-
}
79+
})

0 commit comments

Comments
 (0)