uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
57
pkgs/applications/misc/ding/default.nix
Normal file
57
pkgs/applications/misc/ding/default.nix
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
{ aspell, aspellDicts_de, aspellDicts_en, buildEnv, fetchurl, fortune, gnugrep, makeWrapper, lib, stdenv, tk, tre }:
|
||||
let
|
||||
aspellEnv = buildEnv {
|
||||
name = "env-ding-aspell";
|
||||
paths = [
|
||||
aspell
|
||||
aspellDicts_de
|
||||
aspellDicts_en
|
||||
];
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ding";
|
||||
version = "1.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.tu-chemnitz.de/pub/Local/urz/ding/ding-${version}.tar.gz";
|
||||
sha256 = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ aspellEnv fortune gnugrep tk tre ];
|
||||
|
||||
patches = [ ./dict.patch ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/dict
|
||||
mkdir -p $out/share/man/man1
|
||||
mkdir -p $out/share/applications
|
||||
mkdir -p $out/share/pixmaps
|
||||
|
||||
for f in ding ding.1; do
|
||||
sed -i "s@/usr/share@$out/share@g" "$f"
|
||||
done
|
||||
|
||||
sed -i "s@/usr/bin/fortune@fortune@g" ding
|
||||
|
||||
sed -i "s@/usr/bin/ding@$out/bin/ding@g" ding.desktop
|
||||
|
||||
cp -v ding $out/bin/
|
||||
cp -v de-en.txt $out/share/dict/
|
||||
cp -v ding.1 $out/share/man/man1/
|
||||
cp -v ding.png $out/share/pixmaps/
|
||||
cp -v ding.desktop $out/share/applications/
|
||||
|
||||
wrapProgram $out/bin/ding --prefix PATH : ${lib.makeBinPath [ gnugrep aspellEnv tk fortune ]} --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\""
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple and fast dictionary lookup tool";
|
||||
homepage = "https://www-user.tu-chemnitz.de/~fri/ding/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux; # homepage says: unix-like except darwin
|
||||
maintainers = [ maintainers.exi ];
|
||||
};
|
||||
}
|
||||
26
pkgs/applications/misc/ding/dict.patch
Normal file
26
pkgs/applications/misc/ding/dict.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
Ding persists its settings to $HOME/.dingrc on startup, this sadly includes the path to the dictionary.
|
||||
On all other distributions, that would be /usr/share/dict/de-en.txt and would hardly ever change.
|
||||
On nixos, this will indeed change on ever update and would break it for all users.
|
||||
This just comments out the dictionary path in the .dingrc so the user can still set it if she wants to, but it will not affect normal operations.
|
||||
--- a/ding
|
||||
+++ b/ding
|
||||
@@ -899,7 +899,9 @@ if { ! [info exists ding_version]} {
|
||||
}
|
||||
|
||||
# Change path of default ger-eng.txt when upgrading from version 1.1
|
||||
- if {$searchmeth($i,dictfile) == {/usr/dict/ger-eng.txt} &&
|
||||
+ if {! [info exists searchmeth($i,dictfile)]} {
|
||||
+ set searchmeth($i,dictfile) $default_searchmeth(0,dictfile)
|
||||
+ } elseif {$searchmeth($i,dictfile) == {/usr/dict/ger-eng.txt} &&
|
||||
$ding_version == {1.1}} {
|
||||
set searchmeth($i,dictfile) $default_searchmeth(0,dictfile)
|
||||
debug 2 "New path and name of ger-eng.txt configured: $default_searchmeth(0,dictfile)"
|
||||
@@ -5065,7 +5067,7 @@ proc saveOptions {} {
|
||||
foreach i $searchmpos {
|
||||
puts $fd "set searchmeth($n,name) {$searchmeth($i,name)}"
|
||||
puts $fd "set searchmeth($n,type) {$searchmeth($i,type)}"
|
||||
- puts $fd "set searchmeth($n,dictfile) {$searchmeth($i,dictfile)}"
|
||||
+ puts $fd "#set searchmeth($n,dictfile) {$searchmeth($i,dictfile)}"
|
||||
puts $fd "set searchmeth($n,separator) {$searchmeth($i,separator)}"
|
||||
puts $fd "set searchmeth($n,language1) {$searchmeth($i,language1)}"
|
||||
puts $fd "set searchmeth($n,language2) {$searchmeth($i,language2)}"
|
||||
Loading…
Add table
Add a link
Reference in a new issue