From 92d44ea36fdcbfa79219ef58c951391c5ec10df1 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:21:53 +0200 Subject: [PATCH] cygwin-setup: remove 'with lib;' --- pkgs/os-specific/windows/cygwin-setup/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix index 074157c182c3..a88d802c5cf7 100644 --- a/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -2,8 +2,6 @@ , zlib, bzip2, xz, libgcrypt }: -with lib; - stdenv.mkDerivation rec { pname = "cygwin-setup"; version = "20131101"; @@ -18,9 +16,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool flex bison pkg-config ]; buildInputs = let - mkStatic = flip overrideDerivation (o: { + mkStatic = lib.flip lib.overrideDerivation (o: { dontDisableStatic = true; - configureFlags = toList (o.configureFlags or []) ++ [ "--enable-static" ]; + configureFlags = lib.toList (o.configureFlags or []) ++ [ "--enable-static" ]; buildInputs = map mkStatic (o.buildInputs or []); propagatedBuildInputs = map mkStatic (o.propagatedBuildInputs or []); }); @@ -41,6 +39,6 @@ stdenv.mkDerivation rec { meta = { homepage = "https://sourceware.org/cygwin-apps/setup.html"; description = "Tool for installing Cygwin"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; }