From c3330fa752d2fa06d6f8ad68d535152fb9d1d778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 25 Sep 2021 18:40:56 +0200
Subject: [PATCH] cpio: clean up the nix expression

---
 pkgs/tools/archivers/cpio/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix
index 7aeeef7322ee..5b57dc20e3bf 100644
--- a/pkgs/tools/archivers/cpio/default.nix
+++ b/pkgs/tools/archivers/cpio/default.nix
@@ -1,13 +1,11 @@
 { lib, stdenv, fetchurl, fetchpatch }:
 
-let
+stdenv.mkDerivation rec {
+  pname = "cpio";
   version = "2.13";
-  name = "cpio-${version}";
-in stdenv.mkDerivation {
-  inherit name;
 
   src = fetchurl {
-    url = "mirror://gnu/cpio/${name}.tar.bz2";
+    url = "mirror://gnu/cpio/cpio-${version}.tar.bz2";
     sha256 = "0vbgnhkawdllgnkdn6zn1f56fczwk0518krakz2qbwhxmv2vvdga";
   };
 
@@ -26,9 +24,9 @@ in stdenv.mkDerivation {
         "0pidkbxalpj5yz4fr95x8h0rizgjij0xgvjgirfkjk460giawwg6")
   ];
 
-  preConfigure = if stdenv.isCygwin then ''
+  preConfigure = lib.optionalString stdenv.isCygwin ''
     sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
-  '' else null;
+  '';
 
   enableParallelBuilding = true;