xkbd: init at 0.8.18 #45623
Merged
xkbd: init at 0.8.18 #45623
+32
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
infinisil
requested changes
Aug 25, 2018
| , automake | ||
| , libtool | ||
| , pkgconfig | ||
| }: |
There was a problem hiding this comment.
Indentation should be like
{ stdenv, fetchFromGitHub, freetype, libXrender, ... # 80 columns
, libXext, libX, ... # 80 columns
, ...
}:| src = fetchFromGitHub { | ||
| owner = "mahatma-kaganovich"; | ||
| repo = "xkbd"; | ||
| rev = "${name}"; |
There was a problem hiding this comment.
This is the same as rev = name;
| }; | ||
|
|
||
| buildInputs = [ freetype libXrender libXft libXext libXtst libXpm libX11 | ||
| libXi xextproto xinput xproto ]; |
There was a problem hiding this comment.
Indentation should be like
buildInputs = [
freetype libXrender ...
libxi ...
]| autoconf | ||
| automake | ||
| libtool | ||
| pkgconfig ]; |
| autoheader | ||
| libtoolize | ||
| automake --add-missing | ||
| autoconf |
There was a problem hiding this comment.
Please use spaces throughout the whole file, don't mix with tabs
| description = "onscreen soft keyboard for X11"; | ||
| license = licenses.gpl2Plus; | ||
| maintainers = [ maintainers.genesis ]; | ||
| platforms = platforms.linux; |
GrahamcOfBorg
added
8.has: package (new)
bignaux
force-pushed
the
xkbd
branch
2 times, most recently
from
c67b174 to
b69c2a3
Compare
|
@GrahamcOfBorg build xkbd |
|
Success on x86_64-linux (full log) Attempted: xkbd Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: xkbd Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: xkbd Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: xkbd Partial log (click to expand)
|
|
@infinisil : Should be ready to merge :)) |
infinisil
requested changes
Aug 25, 2018
| { stdenv, fetchFromGitHub, freetype, libXrender, libXft, xextproto | ||
| , xinput, libXi, libXext, libXtst, libXpm, libX11, xproto, expat, zlib | ||
| , autoconf, automake, libtool, pkgconfig | ||
| }: |
| description = "onscreen soft keyboard for X11"; | ||
| license = licenses.gpl2Plus; | ||
| maintainers = [ maintainers.genesis ]; | ||
| platforms = platforms.linux; |
There was a problem hiding this comment.
And here as well. These should be indented one more
|
oki, fixed |
|
Success on x86_64-linux (full log) Attempted: xkbd Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: xkbd Partial log (click to expand)
|
infinisil
requested changes
Aug 25, 2018
| @@ -0,0 +1,44 @@ | |||
| { stdenv, fetchFromGitHub, freetype, libXrender, libXft, xextproto | |||
| , xinput, libXi, libXext, libXtst, libXpm, libX11, xproto, expat, zlib | |||
jtojnar
reviewed
Aug 25, 2018
| ]; | ||
|
|
||
| preConfigure = '' | ||
| aclocal |
There was a problem hiding this comment.
Would not autoreconf work here instead of all the commands?
There was a problem hiding this comment.
perharps but i followed the manual... let me keep that for next release.
There was a problem hiding this comment.
i'm in a "Release early, release often" , i improve navit derivation and need that. I always keep a lot of improvement in a zim wiki, and i improve step by step.
There was a problem hiding this comment.
Ah right, you can just set nativeBuildInputs = [ autoreconfHook ]; and remove preConfigure and it will work (tested this myself).
|
Success on x86_64-linux (full log) Attempted: xkbd Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: xkbd Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: xkbd Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: xkbd Partial log (click to expand)
|
infinisil
reviewed
Aug 25, 2018
| @@ -0,0 +1,31 @@ | |||
| { stdenv, fetchFromGitHub, freetype, libXrender, libXft, xextproto | |||
| , xinput, libXi, libXext, libXtst, libXpm, libX11, xproto, autoconf | |||
| , automake, libtool, pkgconfig, autoreconfHook, bash, perl | |||
There was a problem hiding this comment.
You should remove all unused function arguments again
|
Success on x86_64-linux (full log) Attempted: xkbd Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: xkbd Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: xkbd Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: xkbd Partial log (click to expand)
|
infinisil
approved these changes
Aug 26, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
i need this to fix onscreen in navit.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)