diff options
| author | Juanjo Presa <juanjop@gmail.com> | 2019-11-07 16:58:40 +0100 |
|---|---|---|
| committer | Juanjo Presa <juanjop@gmail.com> | 2019-11-11 21:38:15 +0000 |
| commit | 8ea52dfbdf59052ff866fecd30abe1f7d26475f8 (patch) | |
| tree | a24a0613cd1b3e717743c2d0767d03a801665934 /pkgs/desktops/gnome-2 | |
| parent | 67effde499ffb60da484ebbbd643c6dc69f8eb77 (diff) | |
| download | nixpkgs-8ea52dfbdf59052ff866fecd30abe1f7d26475f8.tar nixpkgs-8ea52dfbdf59052ff866fecd30abe1f7d26475f8.tar.gz nixpkgs-8ea52dfbdf59052ff866fecd30abe1f7d26475f8.tar.bz2 nixpkgs-8ea52dfbdf59052ff866fecd30abe1f7d26475f8.tar.lz nixpkgs-8ea52dfbdf59052ff866fecd30abe1f7d26475f8.tar.xz nixpkgs-8ea52dfbdf59052ff866fecd30abe1f7d26475f8.tar.zst nixpkgs-8ea52dfbdf59052ff866fecd30abe1f7d26475f8.zip | |
gnome2.gnome_vfs: openssl-1.1 patch
Use fetchpatch and explain the issue
Diffstat (limited to 'pkgs/desktops/gnome-2')
| -rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 6cc6848b316..d0a7a890355 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -37,9 +37,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { }; - gnome_vfs = callPackage ./platform/gnome-vfs { - openssl = pkgs.openssl_1_0_2; - }; + gnome_vfs = callPackage ./platform/gnome-vfs { }; libgnome = callPackage ./platform/libgnome { }; diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index c15f43b542a..7196840978f 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib +{ stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, bzip2, openssl, dbus-glib , glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: stdenv.mkDerivation rec { @@ -20,6 +20,18 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ GConf glib ]; + # struct SSL is opaque in openssl-1.1; and the SSL_free() man page + # says that one should not free members of it manually (in both + # the openssl-1.0 and openssl-1.1 man pages). + # https://bugs.gentoo.org/592540 + patches = [ (fetchpatch { + name = "gnome-vfs-2.24.4-openssl-1.1.patch"; + url = "https://bugs.gentoo.org/attachment.cgi?id=535944"; + sha256 = "1q4icapvmwmd5rjah7rr0bqazzk5cg36znmjlpra20n9y27nz040"; + extraPrefix = ""; + }) + ]; + postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i "; doCheck = false; # needs dbus daemon |