diff --git a/configs/packages.nix b/configs/packages.nix index 744a339..fedd4b3 100644 --- a/configs/packages.nix +++ b/configs/packages.nix @@ -4,6 +4,7 @@ let iolanguage = pkgs.callPackage ../packages/iolanguage.nix {}; sncli = pkgs.python3Packages.callPackage ../packages/sncli.nix {}; todoist = pkgs.callPackage ../packages/todoist {}; + dic = pkgs.callPackage ../packages/dic.nix {}; haskells = import ../dot/haskells.nix; unstable = import {}; executables = pkgs.haskell.lib.justStaticExecutables; @@ -186,6 +187,7 @@ in with pkgs; pass qrencode sncli + dic tmuxp unstable.hledger wordnet diff --git a/configs/scripts.nix b/configs/scripts.nix index a612345..081f4d2 100644 --- a/configs/scripts.nix +++ b/configs/scripts.nix @@ -354,13 +354,6 @@ let sha256 = "1532w34p46mjqnm2bx72f98gacgb3ncd00rflxr54pq94klh26is"; }; in pkgs.writeScriptBin "generate-shell-nix" (builtins.readFile "${repository.out}/generate-shell-nix"); - scripts.dic = - let repository = pkgs.fetchgit { - url = "https://cgit.krebsco.de/dic"; - rev = "beeca40313f68874e05568f4041423c16202e9da"; - sha256 = "1xzn20b9kfz96nvjli8grpi11v80jbl0dmifksmirwcj5v81ndav"; - }; - in pkgs.writeScriptBin "dic" (builtins.readFile "${repository.out}/dic"); scripts.font-size = unstable.writers.writeDashBin "font-size" '' set -efu diff --git a/packages/dic.nix b/packages/dic.nix new file mode 100644 index 0000000..6533a1b --- /dev/null +++ b/packages/dic.nix @@ -0,0 +1,37 @@ +{ coreutils, curl, fetchgit, gnugrep, gnused, stdenv, utillinux }: + +stdenv.mkDerivation { + name = "dic"; + + src = fetchgit { + url = http://cgit.ni.krebsco.de/dic; + rev = "refs/tags/v1.1.0"; + sha256 = "1xzn20b9kfz96nvjli8grpi11v80jbl0dmifksmirwcj5v81ndav"; + }; + + phases = [ + "unpackPhase" + "installPhase" + ]; + + installPhase = + let + path = stdenv.lib.makeBinPath [ + coreutils + curl + gnused + gnugrep + utillinux + ]; + in + '' + mkdir -p $out/bin + + sed \ + 's,^main() {$,&\n PATH=${path}; export PATH,' \ + < ./dic \ + > $out/bin/dic + + chmod +x $out/bin/dic + ''; +}