summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-02-21 02:57:59 +0100
committerJan Tojnar <jtojnar@gmail.com>2018-03-01 02:53:00 +0100
commit20e53c0b14b85112d180d18f424fb75dd78053da (patch)
treef0e811333475911d12ac8381cd70ea5321e39c5e
parentcb5c630db2fde6b04fe955c4cdb2fcf24753662b (diff)
downloadnixpkgs-20e53c0b14b85112d180d18f424fb75dd78053da.tar
nixpkgs-20e53c0b14b85112d180d18f424fb75dd78053da.tar.gz
nixpkgs-20e53c0b14b85112d180d18f424fb75dd78053da.tar.bz2
nixpkgs-20e53c0b14b85112d180d18f424fb75dd78053da.tar.lz
nixpkgs-20e53c0b14b85112d180d18f424fb75dd78053da.tar.xz
nixpkgs-20e53c0b14b85112d180d18f424fb75dd78053da.tar.zst
nixpkgs-20e53c0b14b85112d180d18f424fb75dd78053da.zip
gnome3.accerciser: move src.nix to default.nix
-rw-r--r--pkgs/desktops/gnome-3/apps/accerciser/default.nix21
-rw-r--r--pkgs/desktops/gnome-3/apps/accerciser/src.nix10
2 files changed, 17 insertions, 14 deletions
diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index bf823426f60..a96d4f7a8ea 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
@@ -3,17 +3,30 @@
 , dbus, intltool, libwnck3 }:
 
 stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) src name;
+  name = "accerciser-${version}";
+  version = "3.22.0";
 
-  nativeBuildInputs = [ pkgconfig ];
+  src = fetchurl {
+    url = "mirror://gnome/sources/accerciser/${gnome3.versionBranch version}/${name}.tar.xz";
+    sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5";
+  };
+
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook itstool intltool ];
   buildInputs = [
-    gtk3 wrapGAppsHook itstool libxml2 python3Packages.python python3Packages.pyatspi
+    gtk3 libxml2 python3Packages.python python3Packages.pyatspi
     python3Packages.pygobject3 python3Packages.ipython
-    at-spi2-core dbus intltool libwnck3 gnome3.defaultIconTheme
+    at-spi2-core dbus libwnck3 gnome3.defaultIconTheme
   ];
 
   wrapPrefixVariables = [ "PYTHONPATH" ];
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "accerciser";
+      attrPath = "gnome3.accerciser";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Accerciser;
     description = "Interactive Python accessibility explorer";
diff --git a/pkgs/desktops/gnome-3/apps/accerciser/src.nix b/pkgs/desktops/gnome-3/apps/accerciser/src.nix
deleted file mode 100644
index 20bd0083964..00000000000
--- a/pkgs/desktops/gnome-3/apps/accerciser/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "accerciser-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/accerciser/3.22/accerciser-3.22.0.tar.xz;
-    sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5";
-  };
-}