diff options
author | 3JlOy_PYCCKUI <3jl0y_pycckui@riseup.net> | 2023-11-02 02:08:31 +0300 |
---|---|---|
committer | 3JlOy_PYCCKUI <3jl0y_pycckui@riseup.net> | 2023-11-02 02:19:15 +0300 |
commit | 83db0c3f15b3844f1c6566918ca3b6ae0ddfc8be (patch) | |
tree | e972a30ca1f5877d5508133e49667b85bd7850b9 | |
parent | 2c732a9b5a5a60d91c685c92b87db5b8f5cf5812 (diff) | |
download | nixpkgs-83db0c3f15b3844f1c6566918ca3b6ae0ddfc8be.tar nixpkgs-83db0c3f15b3844f1c6566918ca3b6ae0ddfc8be.tar.gz nixpkgs-83db0c3f15b3844f1c6566918ca3b6ae0ddfc8be.tar.bz2 nixpkgs-83db0c3f15b3844f1c6566918ca3b6ae0ddfc8be.tar.lz nixpkgs-83db0c3f15b3844f1c6566918ca3b6ae0ddfc8be.tar.xz nixpkgs-83db0c3f15b3844f1c6566918ca3b6ae0ddfc8be.tar.zst nixpkgs-83db0c3f15b3844f1c6566918ca3b6ae0ddfc8be.zip |
slstatus: unstable-2022-12-19 -> 1.0
-rw-r--r-- | pkgs/applications/misc/slstatus/default.nix | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index 4f022d81f62..83407f94fcb 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -7,29 +7,32 @@ , libXau , libXdmcp , conf ? null -, patches ? [] +, patches ? [ ] }: stdenv.mkDerivation rec { pname = "slstatus"; - version = "unstable-2022-12-19"; + version = "1.0"; src = fetchgit { url = "https://git.suckless.org/slstatus"; - rev = "c919def84fd4f52f501548e5f7705b9d56dd1459"; - hash = "sha256-nEIHIO8CAYdtX8GniO6GDEaHj7kEu81b05nCMVdr2SE="; + rev = version; + hash = "sha256-cFah6EgApslLSlJaOy/5W9ZV9Z1lzfKye/rRh9Om3T4="; }; - configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); - preBuild = '' - ${lib.optionalString (conf!=null) "cp ${configFile} config.def.h"} - makeFlagsArray+=(LDLIBS="-lX11 -lxcb -lXau -lXdmcp" CC=$CC) - ''; + preBuild = + let + configFile = if lib.isDerivation conf || builtins.isPath conf then conf else writeText "config.def.h" conf; + in + '' + ${lib.optionalString (conf!=null) "cp ${configFile} config.def.h"} + makeFlagsArray+=(LDLIBS="-lX11 -lxcb -lXau -lXdmcp" CC=$CC) + ''; inherit patches; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXau libXdmcp]; + buildInputs = [ libX11 libXau libXdmcp ]; installFlags = [ "PREFIX=$(out)" ]; |