aboutsummaryrefslogtreecommitdiff
path: root/pkgs
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2022-10-11 09:04:43 +0200
committerKarel Kočí <cynerd@email.cz>2022-10-11 09:04:43 +0200
commitc57793639f332984bbe90b3c991fef931b915c29 (patch)
treee448fd8c47bdaafec1069c762dd4b711ef4360c6 /pkgs
parentd893d05c57fa16c285716121014f596d74d2a9cf (diff)
downloadnixos-personal-c57793639f332984bbe90b3c991fef931b915c29.tar.gz
nixos-personal-c57793639f332984bbe90b3c991fef931b915c29.tar.bz2
nixos-personal-c57793639f332984bbe90b3c991fef931b915c29.zip
pkgs: drop ferdium to use upstream version
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/default.nix6
-rw-r--r--pkgs/ferdium/default.nix32
2 files changed, 0 insertions, 38 deletions
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" ];
- };
-}