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

sx: migrate to resholve.mkDerivation

authored by

Anderson Torres and committed by
GitHub
fe306509 01e4d1a6

+24 -9
+24 -9
pkgs/tools/X11/sx/default.nix
··· 1 - { coreutils, fetchFromGitHub, lib, makeWrapper, stdenv, util-linux, xauth, xorgserver }: 1 + { lib 2 + , bash 3 + , coreutils 4 + , fetchFromGitHub 5 + , resholve 6 + , xauth 7 + , xorgserver 8 + }: 2 9 3 - stdenv.mkDerivation rec { 10 + resholve.mkDerivation rec { 4 11 pname = "sx"; 5 12 version = "2.1.7"; 6 13 ··· 11 18 sha256 = "0xv15m30nhcknasqiybj5wwf7l91q4a4jf6xind8x5x00c6br6nl"; 12 19 }; 13 20 14 - nativeBuildInputs = [ makeWrapper ]; 15 - 16 21 makeFlags = [ "PREFIX=$(out)" ]; 17 22 18 - postInstall = '' 19 - wrapProgram $out/bin/sx \ 20 - --prefix PATH : ${lib.makeBinPath [ coreutils util-linux xorgserver xauth ]} 21 - ''; 23 + solutions = { 24 + sx = { 25 + scripts = [ "bin/sx" ]; 26 + interpreter = "${bash}/bin/sh"; 27 + inputs = [ 28 + coreutils 29 + xauth 30 + xorgserver 31 + ]; 32 + execer = [ 33 + "cannot:${xorgserver}/bin/Xorg" 34 + ]; 35 + }; 36 + }; 22 37 23 38 meta = with lib; { 24 39 description = "Simple alternative to both xinit and startx for starting a Xorg server"; 25 40 homepage = "https://github.com/earnestly/sx"; 26 41 license = licenses.mit; 27 42 platforms = platforms.linux; 28 - maintainers = with maintainers; [ figsoda ]; 43 + maintainers = with maintainers; [ figsoda thiagokokada ]; 29 44 }; 30 45 }