From 747e75750077bb5b378140d43eac1c17547fa1fc Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 17 Nov 2013 22:21:56 +0100
Subject: libunique: fix build, make the package unique

The one in gnome2 was failing to build,
but all there is likely in a desolate state anyway.

In gmpc it also seemed without any reason to have a duplicate.
---
 pkgs/applications/audio/gmpc/default.nix             | 18 +-----------------
 pkgs/desktops/gnome-2/default.nix                    |  4 ++--
 pkgs/desktops/gnome-2/platform/libunique/default.nix | 14 --------------
 pkgs/development/libraries/libunique/default.nix     |  1 -
 4 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-2/platform/libunique/default.nix

diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix
index 10a2f0dcee94..728155c02bda 100644
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libtool, intltool, pkgconfig, glib
-, gtk, curl, mpd_clientlib, libsoup, gob2, vala
+, gtk, curl, mpd_clientlib, libsoup, gob2, vala, libunique
 }:
 
 stdenv.mkDerivation rec {
@@ -15,22 +15,6 @@ stdenv.mkDerivation rec {
     buildInputs = [ pkgconfig glib ];
   };
 
-  libunique = stdenv.mkDerivation {
-    name = "libunique-1.1.6";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/sources/libunique/1.1/libunique-1.1.6.tar.gz;
-      sha256 = "2cb918dde3554228a211925ba6165a661fd782394bd74dfe15e3853dc9c573ea";
-    };
-    buildInputs = [ pkgconfig glib gtk ];
-
-    patches = [
-      (fetchurl {
-        url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/remove_G_CONST_RETURN.patch?h=packages/libunique";
-        sha256 = "0da2qi7cyyax4rr1p25drlhk360h8d3lapgypi5w95wj9k6bykhr";
-      })
-    ];
-  };
-
   src = fetchurl {
     url = "http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz";
     sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556";
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index ce8d9e54c723..cecd56ad4f27 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, self, stdenv, gettext, gvfs, overrides ? {} }:
+{ callPackage, self, stdenv, gettext, gvfs, libunique, overrides ? {} }:
 {
   __overrides = overrides;
 
@@ -67,7 +67,7 @@
   startup_notification = callPackage ./platform/startup-notification { };
 
   # Required for nautilus
-  libunique = callPackage ./platform/libunique { };
+  inherit (libunique);
 
   gtkglext = callPackage ./platform/gtkglext { };
 
diff --git a/pkgs/desktops/gnome-2/platform/libunique/default.nix b/pkgs/desktops/gnome-2/platform/libunique/default.nix
deleted file mode 100644
index 6b9cee800429..000000000000
--- a/pkgs/desktops/gnome-2/platform/libunique/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl_gnome, pkgconfig, gtk}:
-
-stdenv.mkDerivation rec {
-  name = src.pkgname;
-
-  src = fetchurl_gnome {
-    project = "libunique";
-    major = "1"; minor = "1"; patchlevel = "6";
-    sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk ];
-}
diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix
index 603759d47c06..125cb890008d 100644
--- a/pkgs/development/libraries/libunique/default.nix
+++ b/pkgs/development/libraries/libunique/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig glib gtk dbus_glib ];
 
   # don't make deprecated usages hard errors
-  preBuildPhases = "preBuild";
   preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""'';
 
   doCheck = true;
-- 
cgit 1.4.1