From 70619ef955967889a1250419e0047f3823cb4a09 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Wed, 8 May 2019 14:08:48 +0200
Subject: [PATCH] switching to nixpkgs unstable zotero

---
 home/home.nix      |  2 +-
 home/ov/zotero.nix | 69 ----------------------------------------------
 home/overlays.nix  |  3 +-
 3 files changed, 3 insertions(+), 71 deletions(-)
 delete mode 100644 home/ov/zotero.nix

diff --git a/home/home.nix b/home/home.nix
index 25a1f65..2711388 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -12,7 +12,7 @@ let
     thunderbird
     calibre
     dino
-    zotero
+    unstable.zotero
     keepassxc
     ding
     aspell
diff --git a/home/ov/zotero.nix b/home/ov/zotero.nix
deleted file mode 100644
index 2c30738..0000000
--- a/home/ov/zotero.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings-desktop-schemas, gtk3, gnome3 }:
-
-let
-version = "5.0.66";
-meta = with stdenv.lib; {
-  homepage = https://www.zotero.org;
-  description = "Collect, organize, cite, and share your research sources";
-  license = licenses.agpl3;
-  platforms = platforms.linux;
-};
-
-zoteroSrc = stdenv.mkDerivation rec {
-  inherit version;
-  name = "zotero-${version}-pkg";
-
-  src = fetchurl {
-    url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
-    sha256 = "1dpcwpag95a4r46z03a3gqklis0q7nzqgjg34qfxxxb2lr7s1lsm";
-  };
-
-  buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ];
-  phases = [ "unpackPhase" "installPhase" "fixupPhase"];
-
-  installPhase = ''
-    mkdir -p $out/data
-    cp -r * $out/data
-    mkdir $out/bin
-    ln -s $out/data/zotero $out/bin/zotero
-  '';
-};
-
-fhsEnv = buildFHSUserEnv {
-  name = "zotero-fhs-env";
-  targetPkgs = pkgs: with pkgs; with xorg; [
-    gtk3 dbus-glib
-    libXt nss
-    libX11
-    # for xdg-open finding the pdf reader
-    okular
-  ];
-};
-
-desktopItem = makeDesktopItem rec {
-  name = "zotero-${version}";
-  exec = "zotero -url %U";
-  icon = "zotero";
-  type = "Application";
-  comment = meta.description;
-  desktopName = "Zotero";
-  genericName = "Reference Management";
-  categories = "Office;Database;";
-  startupNotify = "true";
-};
-
-in runCommand "zotero-${version}" { inherit meta; } ''
-  mkdir -p $out/bin $out/share/applications
-  cat >$out/bin/zotero <<EOF
-#!${bash}/bin/bash
-${fhsEnv}/bin/zotero-fhs-env ${zoteroSrc}/bin/zotero
-EOF
-  chmod +x $out/bin/zotero
-
-  cp ${desktopItem}/share/applications/* $out/share/applications/
-
-  for size in 16 32 48 256; do
-    install -Dm444 ${zoteroSrc}/data/chrome/icons/default/default$size.png \
-      $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png
-  done
-''
diff --git a/home/overlays.nix b/home/overlays.nix
index d7d59f8..69febdf 100644
--- a/home/overlays.nix
+++ b/home/overlays.nix
@@ -1,6 +1,7 @@
 [(self: super:
 {
   amarok = super.libsForQt5.callPackage ./ov/amarok.nix {};
-  zotero = super.callPackage ./ov/zotero.nix {};
+  stapler = super.python2.callPackage ./ov/stapler.nix {};
+  #tor-browser-bundle-bin = super.callPackage ./ov/tor-browser-bundle-bin.nix { inherit (super.gnome3) defaultIconTheme; };
 }
 )]