summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2019-08-15 01:11:32 +0200
committeraszlig <aszlig@nix.build>2019-08-15 01:11:32 +0200
commit16ecd0d5caa29f4de3e071e61306b1f5d2a2e255 (patch)
tree8e2b18438587e88c8463f5858850138858358526
parent1964b0c1b1e2e8092a15da64bd37838bed261e26 (diff)
xkbvalidate: Rename output binary to xkbvalidate
So far, the output binary has been just "validate", which is quite a very generic name and doesn't match the package name. Even though I highly doubt that this program will ever be used outside of NixOS modules, it's nevertheless less confusing to have a consistent naming. Signed-off-by: aszlig <aszlig@nix.build>
-rw-r--r--nixos/modules/services/x11/xserver.nix2
-rw-r--r--pkgs/tools/X11/xkbvalidate/default.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index b1a316706976..7ffe1c125610 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -714,7 +714,7 @@ in
nativeBuildInputs = [ pkgs.xkbvalidate ];
preferLocalBuild = true;
} ''
- validate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions"
+ xkbvalidate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions"
touch "$out"
'');
diff --git a/pkgs/tools/X11/xkbvalidate/default.nix b/pkgs/tools/X11/xkbvalidate/default.nix
index 2855d03120fd..92a47aa65638 100644
--- a/pkgs/tools/X11/xkbvalidate/default.nix
+++ b/pkgs/tools/X11/xkbvalidate/default.nix
@@ -11,5 +11,5 @@ runCommandCC "xkbvalidate" {
} ''
mkdir -p "$out/bin"
$CC -std=c11 -Wall -pedantic -lxkbcommon ${./xkbvalidate.c} \
- -o "$out/bin/validate"
+ -o "$out/bin/xkbvalidate"
''