From 8647df2fb6be8d586376c2cb76ca5f2518dcbb81 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 23 Apr 2018 20:37:03 +0200
Subject: goocanvas_2: support gobjectIntrospection

---
 pkgs/development/libraries/goocanvas/2.x.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix
index 026f58079f6d..ef36a9c076fb 100644
--- a/pkgs/development/libraries/goocanvas/2.x.nix
+++ b/pkgs/development/libraries/goocanvas/2.x.nix
@@ -13,11 +13,13 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig gettext gtk-doc python2 ];
-  buildInputs = [ gtk3 cairo glib ];
+  buildInputs = [ gtk3 cairo glib gobjectIntrospection ];
 
   configureFlags = [
     "--disable-python"
   ];
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0";
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0";
 
   meta = with stdenv.lib; {
     description = "Canvas widget for GTK+ based on the the Cairo 2D library";
-- 
cgit 1.4.1


From 0e5f82b847632cfd01122915ad9c57b2c65a2026 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 23 Apr 2018 20:37:27 +0200
Subject: pdf-quench: init at 1.0.5

---
 pkgs/applications/misc/pdf-quench/default.nix | 36 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/misc/pdf-quench/default.nix

(limited to 'pkgs')

diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix
new file mode 100644
index 000000000000..5b80fb161224
--- /dev/null
+++ b/pkgs/applications/misc/pdf-quench/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}:
+
+pythonPackages.buildPythonApplication rec {
+  name = "pdf-quench-${version}";
+  version = "1.0.5";
+
+  src = fetchFromGitHub {
+    owner = "linuxerwang";
+    repo = "pdf-quench";
+    rev = "b72b3970b371026f9a7ebe6003581e8a63af98f6";
+    sha256 = "1rp9rlwr6rarcsxygv5x2c5psgwl6r69k0lsgribgyyla9cf2m7n";
+  };
+
+  nativeBuildInputs = [ wrapGAppsHook ];
+  buildInputs = with pkgs; [ gtk3 gobjectIntrospection goocanvas2 (poppler.override { introspectionSupport = true; }) ];
+  propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ];
+
+  dontBuild = true;
+  doCheck = false;
+
+  postPatch = ''
+    substituteInPlace src/pdf_quench.py \
+      --replace /usr/bin/python "${pythonPackages.python}/bin/python"
+    '';
+
+  installPhase = ''
+    install -D -T -m 755 src/pdf_quench.py $out/bin/pdf-quench
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/linuxerwang/pdf-quench;
+    description = "A visual tool for cropping pdf files";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ flokli ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35e320dc31fc..a45a6f2d04a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4276,6 +4276,8 @@ with pkgs;
 
   pdfmod = callPackage ../applications/misc/pdfmod { };
 
+  pdf-quench = callPackage ../applications/misc/pdf-quench { };
+
   jbig2enc = callPackage ../tools/graphics/jbig2enc { };
 
   pdfread = callPackage ../tools/graphics/pdfread {
-- 
cgit 1.4.1


From ccb7e5488e879de3645ca66081f3cb8a638783a4 Mon Sep 17 00:00:00 2001
From: Jörg Thalheim <joerg@thalheim.io>
Date: Mon, 30 Apr 2018 16:01:07 +0100
Subject: pdf-quench: no manual shebang patch

---
 pkgs/applications/misc/pdf-quench/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix
index 5b80fb161224..291ab241b084 100644
--- a/pkgs/applications/misc/pdf-quench/default.nix
+++ b/pkgs/applications/misc/pdf-quench/default.nix
@@ -12,17 +12,17 @@ pythonPackages.buildPythonApplication rec {
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];
-  buildInputs = with pkgs; [ gtk3 gobjectIntrospection goocanvas2 (poppler.override { introspectionSupport = true; }) ];
+  buildInputs = with pkgs; [
+    gtk3
+    gobjectIntrospection
+    goocanvas2
+    (poppler.override { introspectionSupport = true; })
+  ];
   propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ];
 
-  dontBuild = true;
+  format = "other";
   doCheck = false;
 
-  postPatch = ''
-    substituteInPlace src/pdf_quench.py \
-      --replace /usr/bin/python "${pythonPackages.python}/bin/python"
-    '';
-
   installPhase = ''
     install -D -T -m 755 src/pdf_quench.py $out/bin/pdf-quench
   '';
-- 
cgit 1.4.1


From 1478878caba8c9c73780d3615cd1dea6a1686593 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 30 Apr 2018 17:26:59 +0200
Subject: pdf-quench: use poppler_gi from top-level

---
 pkgs/applications/misc/pdf-quench/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix
index 291ab241b084..c567a7903b81 100644
--- a/pkgs/applications/misc/pdf-quench/default.nix
+++ b/pkgs/applications/misc/pdf-quench/default.nix
@@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
     gtk3
     gobjectIntrospection
     goocanvas2
-    (poppler.override { introspectionSupport = true; })
+    poppler_gi
   ];
   propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ];
 
-- 
cgit 1.4.1