Unverified Commit 471292d3 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

[Backport release-25.05] gupnp_1_6: Unbreak on Darwin (#408667)

parents 10ebe60c 8529bbe7

pkgs/development/libraries/gssdp/1.6.nix

+6 −6
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
  gssdp-tools,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "gssdp";

  version = "1.6.3";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec { 
  ];



  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=";

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

  ];



  doCheck = true;

  # On Darwin: Failed to bind socket, Operation not permitted

  doCheck = !stdenv.hostPlatform.isDarwin;



  postFixup = ''

    # Move developer documentation to devdoc output.
@@ -74,7 +75,7 @@ stdenv.mkDerivation rec { 
  passthru = {

    updateScript = gnome.updateScript {

      attrPath = "gssdp_1_6";

      packageName = pname;

      packageName = "gssdp";

    };



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



  meta = with lib; {

    broken = stdenv.hostPlatform.isDarwin;

    description = "GObject-based API for handling resource discovery and announcement over SSDP";

    homepage = "http://www.gupnp.org/";

    license = licenses.lgpl2Plus;

    teams = [ teams.gnome ];

    platforms = platforms.all;

  };

}
 
})

pkgs/development/libraries/gupnp/1.6.nix

+7 −6
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  gnome,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "gupnp";

  version = "1.6.8";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec { 
  ];



  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=";

  };
@@ -54,7 +54,8 @@ stdenv.mkDerivation rec { 
    "-Dgtk_doc=true"

  ];



  doCheck = true;

  # On Darwin: Failed to bind socket, Operation not permitted

  doCheck = !stdenv.hostPlatform.isDarwin;



  postFixup = ''

    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
@@ -64,7 +65,7 @@ stdenv.mkDerivation rec { 
  passthru = {

    updateScript = gnome.updateScript {

      attrPath = "gupnp_1_6";

      packageName = pname;

      packageName = "gupnp";

    };

  };
@@ -73,6 +74,6 @@ stdenv.mkDerivation rec { 
    description = "Implementation of the UPnP specification";

    mainProgram = "gupnp-binding-tool-1.6";

    license = licenses.lgpl2Plus;

    platforms = platforms.linux;

    platforms = platforms.unix;

  };

}
 
})