Merge pull request #177697 from thiagokokada/migrate-sx-to-resholve

sx: migrate to resholve.mkDerivation
This commit is contained in:
Anderson Torres 2022-06-16 11:15:11 -03:00 committed by GitHub
commit fe306509ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,6 +1,13 @@
{ coreutils, fetchFromGitHub, lib, makeWrapper, stdenv, util-linux, xauth, xorgserver }: { lib
, bash
, coreutils
, fetchFromGitHub
, resholve
, xauth
, xorgserver
}:
stdenv.mkDerivation rec { resholve.mkDerivation rec {
pname = "sx"; pname = "sx";
version = "2.1.7"; version = "2.1.7";
@ -11,20 +18,28 @@ stdenv.mkDerivation rec {
sha256 = "0xv15m30nhcknasqiybj5wwf7l91q4a4jf6xind8x5x00c6br6nl"; sha256 = "0xv15m30nhcknasqiybj5wwf7l91q4a4jf6xind8x5x00c6br6nl";
}; };
nativeBuildInputs = [ makeWrapper ];
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];
postInstall = '' solutions = {
wrapProgram $out/bin/sx \ sx = {
--prefix PATH : ${lib.makeBinPath [ coreutils util-linux xorgserver xauth ]} scripts = [ "bin/sx" ];
''; interpreter = "${bash}/bin/sh";
inputs = [
coreutils
xauth
xorgserver
];
execer = [
"cannot:${xorgserver}/bin/Xorg"
];
};
};
meta = with lib; { meta = with lib; {
description = "Simple alternative to both xinit and startx for starting a Xorg server"; description = "Simple alternative to both xinit and startx for starting a Xorg server";
homepage = "https://github.com/earnestly/sx"; homepage = "https://github.com/earnestly/sx";
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ figsoda ]; maintainers = with maintainers; [ figsoda thiagokokada ];
}; };
} }