From e297df011d6d88914a986ae16947a8de0a230009 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 16 Dec 2023 00:41:51 +0000 Subject: [PATCH] xdg-terminal-exec: remove (it exists upstream now) --- pkgs/additional/xdg-terminal-exec/default.nix | 2 - .../xdg-terminal-exec/xdg-terminal-exec | 39 ------------------- pkgs/default.nix | 1 - 3 files changed, 42 deletions(-) delete mode 100644 pkgs/additional/xdg-terminal-exec/default.nix delete mode 100755 pkgs/additional/xdg-terminal-exec/xdg-terminal-exec diff --git a/pkgs/additional/xdg-terminal-exec/default.nix b/pkgs/additional/xdg-terminal-exec/default.nix deleted file mode 100644 index 19bc1be7..00000000 --- a/pkgs/additional/xdg-terminal-exec/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -{ writeShellScriptBin }: -writeShellScriptBin "xdg-terminal-exec" (builtins.readFile ./xdg-terminal-exec) diff --git a/pkgs/additional/xdg-terminal-exec/xdg-terminal-exec b/pkgs/additional/xdg-terminal-exec/xdg-terminal-exec deleted file mode 100755 index e109a0b9..00000000 --- a/pkgs/additional/xdg-terminal-exec/xdg-terminal-exec +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# xdg-terminal-exec is a proposed XDG extension, with example implementation: -# - -# -# its purpose is to allow any program which needs to launch a terminal to do so -# in a manner which respects user preferences. -# it aims to be `xdg-open`, but for opening a terminal. -# -# a notable user is glib/gio: -# and by extension, Firefox -# -# it's not actually packaged for NixOS, nor Alpine, as of 2023/06/29. -# this script is just a hackier version. it lets me insert my preferences - -termargs="$@" - -try_term() { - if command -v "$1" > /dev/null - then - exec "$1" $termargs - fi -} - -# user preference -if [ -n "$TERMINAL" ] -then - exec "$TERMINAL" $termargs -fi - -# hardcoded checks, imprecise order -try_term kitty -try_term alacritty -try_term foot -try_term st -try_term gnome-terminal -try_term konsole - -# fallback to default -exec xterm "$termargs" diff --git a/pkgs/default.nix b/pkgs/default.nix index 279de479..2917cc8e 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -69,7 +69,6 @@ let ; unftp = callPackage ./additional/unftp { }; where-am-i = callPackage ./additional/where-am-i { }; - xdg-terminal-exec = callPackage ./additional/xdg-terminal-exec { }; zecwallet-light-cli = callPackage ./additional/zecwallet-light-cli { }; # packages i haven't used for a while, may or may not still work