From 665a0d28361507ead24998d0b17edbc7ecc828cb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Sep 2017 02:59:29 +0200 Subject: [PATCH] =?UTF-8?q?chrome-gnome-shell:=207d99523=20=E2=86=92=209?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extensions/chrome-gnome-shell/default.nix | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index bda356cf4c3..ffdf58ec5f5 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -1,31 +1,33 @@ -{stdenv, lib, python, dbus, fetchgit, cmake, coreutils, jq, gobjectIntrospection, python27Packages, makeWrapper, gnome3, wrapGAppsHook}: +{stdenv, fetchurl, cmake, ninja, jq, python3, gnome3, wrapGAppsHook}: -stdenv.mkDerivation rec { -name="chrome-gnome-shell"; - src = fetchgit { - url = "git://git.gnome.org/chrome-gnome-shell"; - rev = "7d99523e90805cb65027cc2f5f1191a957dcf276"; - sha256 = "0qc34dbhsz5yf4z5bx6py08h561rcxw9928drgk9256g3vnygnbc"; +let + version = "9"; + + inherit (python3.pkgs) python pygobject3 requests; +in stdenv.mkDerivation rec { + name = "chrome-gnome-shell-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${name}.tar.xz"; + sha256 = "0j6lzlp3jvkpnkk8s99y3m14xiq94rjwjzy2pbfqgv084ahzmz8i"; }; - buildInputs = [ gnome3.gnome_shell makeWrapper jq dbus gobjectIntrospection - python python27Packages.requests python27Packages.pygobject3 wrapGAppsHook]; - - preConfigure = '' - mkdir build usr etc - cd build - ${cmake}/bin/cmake -DCMAKE_INSTALL_PREFIX=$out/usr -DBUILD_EXTENSION=OFF ../ - substituteInPlace cmake_install.cmake --replace "/etc" "$out/etc" - ''; - - postInstall = '' - rm $out/etc/opt/chrome/policies/managed/chrome-gnome-shell.json - rm $out/etc/chromium/policies/managed/chrome-gnome-shell.json - wrapProgram $out/usr/bin/chrome-gnome-shell \ - --prefix PATH : '"${dbus}/bin"' \ - --prefix PATH : '"${gnome3.gnome_shell}/bin"' \ - --prefix PYTHONPATH : "$PYTHONPATH" + nativeBuildInputs = [ cmake ninja jq wrapGAppsHook ]; + buildInputs = [ gnome3.gnome_shell python pygobject3 requests ]; + preConfigure = '' + substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc" ''; + # cmake setup hook changes /etc/opt into /var/empty + dontFixCmake = true; + cmakeFlags = [ "-DBUILD_EXTENSION=OFF" ]; + wrapPrefixVariables = [ "PYTHONPATH" ]; + + meta = with stdenv.lib; { + description = "GNOME Shell integration for Chrome"; + license = licenses.gpl3; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; }