From 66589e4dc7fe746f79e264f2addf5e33517b67c1 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 10 Jan 2018 21:03:50 +0100 Subject: [PATCH 1/2] clipster: fixup the previous version is broken, when you run the daemon, it says: ``` Traceback (most recent call last): File "/nix/store/bzxnrc2lzcd8d8zbfx65vxypijjkhya6-clipster-1.4.1/bin/.clipster-wrapped", line 21, in require_version("Gtk", "3.0") File "/nix/store/s5a6d9v9m939kw6ih9mq9v2bcnbi7cdv-python3-3.6.4-env/lib/python3.6/site-packages/gi/__init__.py", line 130, in require_version raise ValueError('Namespace %s not available' % namespace) ValueError: Namespace Gtk not available ``` --- pkgs/tools/misc/clipster/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index df638f2b556..26983924847 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -1,4 +1,5 @@ -{fetchFromGitHub , stdenv, makeWrapper, python3, gtk3, libwnck3 }: +{fetchFromGitHub , stdenv, python3, gtk3, libwnck3, + gobjectIntrospection, wrapGAppsHook }: stdenv.mkDerivation rec { name = "clipster-${version}"; @@ -13,15 +14,12 @@ stdenv.mkDerivation rec { pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); - buildInputs = [ pythonEnv gtk3 libwnck3 ]; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ pythonEnv gtk3 libwnck3 gobjectIntrospection wrapGAppsHook ]; installPhase = '' sed -i 's/python/python3/g' clipster mkdir -p $out/bin/ cp clipster $out/bin/ - wrapProgram "$out/bin/clipster" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" ''; meta = with stdenv.lib; { From 8f4a7f366d60ffd679dda8af78d0fb6ce70c28ab Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 21 Jan 2018 23:26:14 +0100 Subject: [PATCH 2/2] clipster: 1.4.1 -> 1.5.0 --- pkgs/tools/misc/clipster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index 26983924847..2181e1cb916 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "clipster-${version}"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "mrichar1"; repo = "clipster"; rev = "${version}"; - sha256 = "16gdrm985qwbrsmsqjfyh33glcmx678abl2jpq49djk2qrbhm49k"; + sha256 = "0bj7fk19z3c29vxm3mcp3s7vggkigmz3hrn4pcsqgfh96i5i5203"; }; pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]);