about summary refs log tree commit diff
path: root/pkgs/applications/networking/instant-messengers/telegram
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-07-23 09:40:36 +0300
committerNikolay Amiantov <ab@fmap.me>2016-07-23 09:41:25 +0300
commitcce1e9f2f48dc7f3353c07bc8469b5591d3e7319 (patch)
tree630710768f47fda1334b179b35b9dcbfd1b0f8dd /pkgs/applications/networking/instant-messengers/telegram
parentd5adf1348b5d59c15fe1738b00a96ddfcbfd8061 (diff)
downloadnixlib-cce1e9f2f48dc7f3353c07bc8469b5591d3e7319.tar
nixlib-cce1e9f2f48dc7f3353c07bc8469b5591d3e7319.tar.gz
nixlib-cce1e9f2f48dc7f3353c07bc8469b5591d3e7319.tar.bz2
nixlib-cce1e9f2f48dc7f3353c07bc8469b5591d3e7319.tar.lz
nixlib-cce1e9f2f48dc7f3353c07bc8469b5591d3e7319.tar.xz
nixlib-cce1e9f2f48dc7f3353c07bc8469b5591d3e7319.tar.zst
nixlib-cce1e9f2f48dc7f3353c07bc8469b5591d3e7319.zip
tdesktop: use parseDrvName to get Qt release version
Closes #16559
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/telegram')
-rw-r--r--pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix23
1 files changed, 2 insertions, 21 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 70eedeb42d38..461e755505c0 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -9,29 +9,10 @@
 }:
 
 let
-  /* Find the index of the first element in the list matching the specified
-     predicate or returns null if no such element exists.
-
-     Example:
-       findFirstIndex (x: x > 3) [ 1 6 4 ]
-       => 1
-  */
-  findFirstIndex = pred: list:
-    # Poor man's Either via a list.
-    let searchFun = old: curr:
-          if lib.isList old then old
-            else if pred curr then [old]
-            else old + 1;
-        res = lib.foldl searchFun 0 list;
-    in if lib.isList res then lib.elemAt res 0 else null;
-
-  extractVersion = ver:
-    let suffix = findFirstIndex (x: x == "-") (lib.stringToCharacters ver);
-    in if suffix == null then ver else lib.substring 0 suffix ver;
-
   system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
   packagedQt = "5.6.0";
-  systemQt = extractVersion qtbase.version;
+  # Hacky: split "1.2.3-4" into "1.2.3" and "4"
+  systemQt = (builtins.parseDrvName qtbase.version).name;
 
 in stdenv.mkDerivation rec {
   name = "telegram-desktop-${version}";