Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 701dd5ef1a05
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5f0bceb6a5de
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 13, 2021

  1. pidgin-sipe: Fix build with latest GLib

    @jtojnar
    jtojnar committed Apr 13, 2021
    Copy the full SHA
    5f0bceb View commit details
Showing with 15 additions and 1 deletion.
  1. +15 −1 pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
16 changes: 15 additions & 1 deletion pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pidgin, intltool, libxml2, gmime, nss }:
{ lib, stdenv, fetchurl, fetchpatch, pidgin, intltool, libxml2, gmime, nss }:

stdenv.mkDerivation rec {
pname = "pidgin-sipe";
@@ -9,6 +9,20 @@ stdenv.mkDerivation rec {
sha256 = "0262sz00iqxylx0xfyr48xikhiqzr8pg7b4b7vwj5iv4qxpxv939";
};

patches = [
# add sipe_utils_memdup() function
(fetchpatch {
url = "https://repo.or.cz/siplcs.git/patch/567d0ddc0692adfef5f15d0d383825a9b2ea4b49";
sha256 = "24L8ZfoOGc3JoTCGxuTNjuHzt5QgFDu1+vSoJpGvde4=";
})
# replace g_memdup() with sipe_utils_memdup()
# g_memdup is deprecatein newer Glib
(fetchpatch {
url = "https://repo.or.cz/siplcs.git/patch/583a734e63833f03d11798b7b0d59a17d08ae60f";
sha256 = "Ai6Czpy/FYvBi4GZR7yzch6OcouJgfreI9HcojhGVV4=";
})
];

nativeBuildInputs = [ intltool ];
buildInputs = [ pidgin gmime libxml2 nss ];
enableParallelBuilding = true;