summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2017-02-13 14:25:12 +0100
committerRobin Gloster <mail@glob.in>2019-07-29 21:25:10 +0200
commita22429bf05549514fe0155b7bf8f1278d4305b8a (patch)
tree21a391ffbbcad509396eb9553f5c3156bd44d4f7 /pkgs/desktops
parentc1d336dfcee6a8b22d78d1b5be57b0da65898ff2 (diff)
downloadnixpkgs-a22429bf05549514fe0155b7bf8f1278d4305b8a.tar
nixpkgs-a22429bf05549514fe0155b7bf8f1278d4305b8a.tar.gz
nixpkgs-a22429bf05549514fe0155b7bf8f1278d4305b8a.tar.bz2
nixpkgs-a22429bf05549514fe0155b7bf8f1278d4305b8a.tar.lz
nixpkgs-a22429bf05549514fe0155b7bf8f1278d4305b8a.tar.xz
nixpkgs-a22429bf05549514fe0155b7bf8f1278d4305b8a.tar.zst
nixpkgs-a22429bf05549514fe0155b7bf8f1278d4305b8a.zip
pin some packages to openssl 1.0.2 for now
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/enlightenment/default.nix5
-rw-r--r--pkgs/desktops/gnome-2/default.nix4
2 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix
index a8b5e08abd6..80e57e2ba42 100644
--- a/pkgs/desktops/enlightenment/default.nix
+++ b/pkgs/desktops/enlightenment/default.nix
@@ -1,7 +1,10 @@
 { callPackage, pkgs }:
 rec {
   #### CORE EFL
-  efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; };
+  efl = callPackage ./efl.nix {
+    openjpeg = pkgs.openjpeg_1;
+    openssl = pkgs.openssl_1_0_2;
+  };
 
   #### WINDOW MANAGER
   enlightenment = callPackage ./enlightenment.nix { };
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index 95e6d0f12b0..16828f08bc2 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -37,7 +37,9 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   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 { };