diff options
| -rw-r--r-- | default.nix | 12 | ||||
| -rw-r--r-- | pkgs/katex-wrapper/default.nix (renamed from pkgs/KaTeX/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/xslt/build-xslt/default.nix (renamed from pkgs/xslt/BuildXSLT/default.nix) | 2 | ||||
| -rw-r--r-- | pkgs/xslt/input-xslt/default.nix (renamed from pkgs/xslt/InputXSLT/default.nix) | 2 | ||||
| -rw-r--r-- | pkgs/xslt/make-xslt/default.nix (renamed from pkgs/xslt/makeweb/default.nix) | 8 | ||||
| -rw-r--r-- | pkgs/xslt/static-xslt/default.nix (renamed from pkgs/xslt/StaticXSLT/default.nix) | 2 |
6 files changed, 14 insertions, 12 deletions
diff --git a/default.nix b/default.nix index ffc0ddd..dbacace 100644 --- a/default.nix +++ b/default.nix @@ -2,7 +2,9 @@ let pkgs = import <nixpkgs> { inherit system; }; + callPackage = pkgs.lib.callPackageWith (pkgs // custom); + custom = { custom-vim = callPackage ./pkgs/custom-vim { }; @@ -11,11 +13,11 @@ let oomox-gtk-theme = callPackage ./pkgs/oomox-gtk-theme { }; oomox-archdroid-icon-theme = callPackage ./pkgs/oomox-archdroid-icon-theme { }; - KaTeX = callPackage ./pkgs/KaTeX { }; + katex-wrapper = callPackage ./pkgs/katex-wrapper { }; - InputXSLT = callPackage ./pkgs/xslt/InputXSLT { }; - StaticXSLT = callPackage ./pkgs/xslt/StaticXSLT { }; - BuildXSLT = callPackage ./pkgs/xslt/BuildXSLT { }; - makeweb = callPackage ./pkgs/xslt/makeweb { }; + input-xslt = callPackage ./pkgs/xslt/input-xslt { }; + build-xslt = callPackage ./pkgs/xslt/build-xslt { }; + static-xslt = callPackage ./pkgs/xslt/static-xslt { }; + make-xslt = callPackage ./pkgs/xslt/make-xslt { }; }; in custom diff --git a/pkgs/KaTeX/default.nix b/pkgs/katex-wrapper/default.nix index 37fe63a..37fe63a 100644 --- a/pkgs/KaTeX/default.nix +++ b/pkgs/katex-wrapper/default.nix diff --git a/pkgs/xslt/BuildXSLT/default.nix b/pkgs/xslt/build-xslt/default.nix index 4e5dcb6..578786a 100644 --- a/pkgs/xslt/BuildXSLT/default.nix +++ b/pkgs/xslt/build-xslt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "BuildXSLT"; + name = "build-xslt"; src = fetchFromGitHub { owner = "KnairdA"; diff --git a/pkgs/xslt/InputXSLT/default.nix b/pkgs/xslt/input-xslt/default.nix index a85bc37..cd28a67 100644 --- a/pkgs/xslt/InputXSLT/default.nix +++ b/pkgs/xslt/input-xslt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost, xalanc, xercesc, discount }: stdenv.mkDerivation rec { - name = "InputXSLT"; + name = "input-xslt"; src = fetchFromGitHub { owner = "KnairdA"; diff --git a/pkgs/xslt/makeweb/default.nix b/pkgs/xslt/make-xslt/default.nix index 0527bbc..0fb00cc 100644 --- a/pkgs/xslt/makeweb/default.nix +++ b/pkgs/xslt/make-xslt/default.nix @@ -1,11 +1,11 @@ { pkgs, ... }: let - InputXSLT = pkgs.callPackage ../InputXSLT { }; - StaticXSLT = pkgs.callPackage ../StaticXSLT { }; - BuildXSLT = pkgs.callPackage ../BuildXSLT { }; + InputXSLT = pkgs.callPackage ../input-xslt { }; + BuildXSLT = pkgs.callPackage ../build-xslt { }; + StaticXSLT = pkgs.callPackage ../static-xslt { }; in pkgs.writeScriptBin - "makeweb" + "make-xslt" '' #!/bin/sh ${InputXSLT}/bin/ixslt --input make.xml --transformation ${BuildXSLT}/build.xsl --include ${StaticXSLT}/ diff --git a/pkgs/xslt/StaticXSLT/default.nix b/pkgs/xslt/static-xslt/default.nix index 3caee06..4ef9fba 100644 --- a/pkgs/xslt/StaticXSLT/default.nix +++ b/pkgs/xslt/static-xslt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "StaticXSLT"; + name = "static-xslt"; src = fetchFromGitHub { owner = "KnairdA"; |