cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #72986 from juaningan/gnome_vfs_openssl11

Browse source 
gnome2.gnome_vfs: openssl-1.1 patch
This commit is contained in:
Robin Gloster 2019-11-12 21:28:42 +01:00 committed by GitHub
commit bfe6cb05eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/gnome-2/default.nix
View file

@ -37,9 +37,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { }; gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { };
gnome_vfs = callPackage ./platform/gnome-vfs { gnome_vfs = callPackage ./platform/gnome-vfs { };
openssl = pkgs.openssl_1_0_2;
};
libgnome = callPackage ./platform/libgnome { }; libgnome = callPackage ./platform/libgnome { };

14
pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
View file

@ -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 }: , glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -20,6 +20,18 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ GConf glib ]; 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 "; postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i ";
doCheck = false; # needs dbus daemon doCheck = false; # needs dbus daemon