From 1ba8575f9aacb118467ec20ba34135ce764e6ca6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 25 Dec 2018 04:23:40 +0100
Subject: [PATCH] libcroco: rename from gnome3.libcroco

---
 pkgs/desktops/gnome-3/default.nix                          | 4 +---
 .../core => development/libraries}/libcroco/default.nix    | 7 +++----
 pkgs/top-level/all-packages.nix                            | 4 ++--
 3 files changed, 6 insertions(+), 9 deletions(-)
 rename pkgs/{desktops/gnome-3/core => development/libraries}/libcroco/default.nix (92%)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 6873cc0e82dd..a9cf9b7e9be7 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
     libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
     easytag meld orca rhythmbox shotwell gnome-usage
-    clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub;
+    clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco;
 
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
   libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@@ -161,8 +161,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   eog = callPackage ./core/eog { };
 
-  libcroco = callPackage ./core/libcroco {};
-
   libgee = callPackage ./core/libgee { };
 
   libpeas = callPackage ./core/libpeas {};
diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/development/libraries/libcroco/default.nix
similarity index 92%
rename from pkgs/desktops/gnome-3/core/libcroco/default.nix
rename to pkgs/development/libraries/libcroco/default.nix
index 312231f648f3..dc4a967e7ac6 100644
--- a/pkgs/desktops/gnome-3/core/libcroco/default.nix
+++ b/pkgs/development/libraries/libcroco/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libxml2, glib, fetchpatch, gnome3 }:
-let
+
+stdenv.mkDerivation rec {
   pname = "libcroco";
   version = "0.6.12";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb72a72d8615..1ea64311c399 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3709,6 +3709,8 @@ in
 
   libcloudproviders = callPackage ../development/libraries/libcloudproviders { };
 
+  libcroco = callPackage ../development/libraries/libcroco { };
+
   libsmi = callPackage ../development/libraries/libsmi { };
 
   lesspipe = callPackage ../tools/misc/lesspipe { };
@@ -10611,8 +10613,6 @@ in
 
   libconfuse = callPackage ../development/libraries/libconfuse { };
 
-  inherit (gnome3) libcroco;
-
   libcangjie = callPackage ../development/libraries/libcangjie { };
 
   libcollectdclient = callPackage ../development/libraries/libcollectdclient { };