Merge pull request #200907 from sikmir/st

st: 0.8.5 → 0.9
This commit is contained in:
Mario Rodas 2022-11-13 07:56:04 -05:00 committed by GitHub
commit 6cb79b32bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -14,13 +14,13 @@
, nixosTests , nixosTests
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "st"; pname = "st";
version = "0.8.5"; version = "0.9";
src = fetchurl { src = fetchurl {
url = "https://dl.suckless.org/st/${pname}-${version}.tar.gz"; url = "https://dl.suckless.org/st/st-${finalAttrs.version}.tar.gz";
hash = "sha256-6mgyID7QL/dBgry4raqexFTI+YnnkjLLhZZl4vVEqzc="; hash = "sha256-82NZeZc06ueFvss3QGPwvoM88i+ItPFpzSUbmTJOCOc=";
}; };
inherit patches; inherit patches;
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
configFile = lib.optionalString (conf != null) configFile = lib.optionalString (conf != null)
(writeText "config.def.h" conf); (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 '' + lib.optionalString stdenv.isDarwin ''
substituteInPlace config.mk --replace "-lrt" "" substituteInPlace config.mk --replace "-lrt" ""
''; '';
@ -65,4 +65,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ andsild ]; maintainers = with maintainers; [ andsild ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} })