From c57793639f332984bbe90b3c991fef931b915c29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 11 Oct 2022 09:04:43 +0200 Subject: pkgs: drop ferdium to use upstream version --- pkgs/default.nix | 6 ------ pkgs/ferdium/default.nix | 32 -------------------------------- 2 files changed, 38 deletions(-) delete mode 100644 pkgs/ferdium/default.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index dd47ead..46b65f3 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -21,12 +21,6 @@ let sdcv-unwrapped = callPackage ./sdcv { }; sdcv = callPackage ./stardict/wrapper.nix { stardict = sdcv-unwrapped; }; - ferdium = callPackage ./ferdium { - mkFranzDerivation = callPackage ( - nixpkgs.path + "/pkgs/applications/networking/instant-messengers/franz/generic.nix" - ) { }; - }; - }; in personalpkgs diff --git a/pkgs/ferdium/default.nix b/pkgs/ferdium/default.nix deleted file mode 100644 index 58db93f..0000000 --- a/pkgs/ferdium/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, mkFranzDerivation, fetchurl, xorg, xdg-utils, buildEnv, writeShellScriptBin }: - -let - mkFranzDerivation' = mkFranzDerivation.override { - xdg-utils = buildEnv { - name = "xdg-utils-for-ferdium"; - paths = [ - xdg-utils - (lib.hiPrio (writeShellScriptBin "xdg-open" '' - unset GDK_BACKEND - exec ${xdg-utils}/bin/xdg-open "$@" - '')) - ]; - }; - }; -in -mkFranzDerivation' rec { - pname = "ferdium"; - name = "Ferdium"; - version = "6.0.0"; - src = fetchurl { - url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb"; - sha256 = "0r0l84yj3ad5vyfpc7dhsnm61s9pfmg8xl9jgaachkvnwfanppnz"; - }; - extraBuildInputs = [ xorg.libxshmfence ]; - meta = with lib; { - description = "Combine your favorite messaging services into one application"; - homepage = "https://ferdium.org/"; - license = licenses.asl20; - platforms = [ "x86_64-linux" ]; - }; -} -- cgit v1.2.3