summary refs log tree commit diff
path: root/pkgs/applications/misc/orca/default.nix
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-10-05 02:12:11 +0200
committerJan Tojnar <jtojnar@gmail.com>2018-10-05 02:17:19 +0200
commit5cc18c47813d215c5e198a00f449075df0886f82 (patch)
treea7a538fd8500e80ad87ec61d4b7e4d5b55053719 /pkgs/applications/misc/orca/default.nix
parentdf48060e4cde381842e943cf36831de02e290576 (diff)
downloadnixpkgs-5cc18c47813d215c5e198a00f449075df0886f82.tar
nixpkgs-5cc18c47813d215c5e198a00f449075df0886f82.tar.gz
nixpkgs-5cc18c47813d215c5e198a00f449075df0886f82.tar.bz2
nixpkgs-5cc18c47813d215c5e198a00f449075df0886f82.tar.lz
nixpkgs-5cc18c47813d215c5e198a00f449075df0886f82.tar.xz
nixpkgs-5cc18c47813d215c5e198a00f449075df0886f82.tar.zst
nixpkgs-5cc18c47813d215c5e198a00f449075df0886f82.zip
gnome3: remove versionBranch attribute
Standard library now contains stdenv.lib.versions.majorMinor,
which does the same.
Diffstat (limited to 'pkgs/applications/misc/orca/default.nix')
-rw-r--r--pkgs/applications/misc/orca/default.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index 199fa3e9bfe..0dfc4b2bc58 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgconfig, fetchurl, buildPythonApplication
+{ stdenv, pkgconfig, fetchurl, buildPythonApplication
 , autoreconfHook, wrapGAppsHook, gobjectIntrospection
 , intltool, yelp-tools, itstool, libxmlxx3
 , python, pygobject3, gtk3, gnome3, substituteAll
@@ -7,7 +7,6 @@
 , speechd, brltty, setproctitle, gst_all_1, gst-python
 }:
 
-with lib;
 let
   pname = "orca";
   version = "3.28.2";
@@ -17,7 +16,7 @@ in buildPythonApplication rec {
   format = "other";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "08rh6ji680g5nrw2n7jrxrw7nwg04sj52jxffcfasgss2f51d38q";
   };
 
@@ -54,7 +53,7 @@ in buildPythonApplication rec {
     };
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/Orca;
     description = "Screen reader";
     longDescription = ''