summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2022-02-16 21:16:20 +0000
committerAlyssa Ross <hi@alyssa.is>2022-03-03 13:57:27 +0000
commit4762a265d40b69f7076a3613ea61dd014915a6d9 (patch)
tree01abc83ba963abb7a131cfaae6db5f5dae6cf3ae
parent7ecf7a3493c60f1c1f853f0393551447aa16a437 (diff)
downloadnixpkgs-4762a265d40b69f7076a3613ea61dd014915a6d9.tar
nixpkgs-4762a265d40b69f7076a3613ea61dd014915a6d9.tar.gz
nixpkgs-4762a265d40b69f7076a3613ea61dd014915a6d9.tar.bz2
nixpkgs-4762a265d40b69f7076a3613ea61dd014915a6d9.tar.lz
nixpkgs-4762a265d40b69f7076a3613ea61dd014915a6d9.tar.xz
nixpkgs-4762a265d40b69f7076a3613ea61dd014915a6d9.tar.zst
nixpkgs-4762a265d40b69f7076a3613ea61dd014915a6d9.zip
pkgsMusl.screen: fix build
The patch was causing the build to fail.

The description of the gist the patch is from says:

> Patch for GNU Screen HEAD on OS X, which disables the error message
> "/var/run/utmp: No such file or directory" on launch.

I don't see that message with pkgsMusl.screen, so I think we don't
need the patch any more.
-rw-r--r--pkgs/tools/misc/screen/default.nix9
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index e7e0e420810..884d5317cb8 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, ncurses, utmp, pam ? null }:
+{ lib, stdenv, fetchurl, autoreconfHook, ncurses, utmp, pam ? null }:
 
 stdenv.mkDerivation rec {
   pname = "screen";
@@ -16,13 +16,6 @@ stdenv.mkDerivation rec {
     "--enable-colors256"
   ];
 
-  patches = lib.optional stdenv.hostPlatform.isMusl
-    (fetchpatch {
-      url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff";
-      sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p";
-      stripLen = 1;
-    });
-
   nativeBuildInputs = [
     autoreconfHook
   ];