From e05177ddebdb773ebfc17916a19d399f5dffda01 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 12 Nov 2022 20:33:22 +0300 Subject: [PATCH] =?UTF-8?q?st:=200.8.5=20=E2=86=92=200.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/terminal-emulators/st/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix index efbdc040589f..da48550877c7 100644 --- a/pkgs/applications/terminal-emulators/st/default.nix +++ b/pkgs/applications/terminal-emulators/st/default.nix @@ -14,13 +14,13 @@ , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "st"; - version = "0.8.5"; + version = "0.9"; src = fetchurl { - url = "https://dl.suckless.org/st/${pname}-${version}.tar.gz"; - hash = "sha256-6mgyID7QL/dBgry4raqexFTI+YnnkjLLhZZl4vVEqzc="; + url = "https://dl.suckless.org/st/st-${finalAttrs.version}.tar.gz"; + hash = "sha256-82NZeZc06ueFvss3QGPwvoM88i+ItPFpzSUbmTJOCOc="; }; inherit patches; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configFile = lib.optionalString (conf != null) (writeText "config.def.h" conf); - postPatch = lib.optionalString (conf != null) "cp ${configFile} config.def.h" + postPatch = lib.optionalString (conf != null) "cp ${finalAttrs.configFile} config.def.h" + lib.optionalString stdenv.isDarwin '' substituteInPlace config.mk --replace "-lrt" "" ''; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ andsild ]; platforms = platforms.unix; }; -} +})