diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/os-specific/windows/cygwin-setup/default.nix | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/os-specific/windows/cygwin-setup/default.nix')
-rw-r--r-- | pkgs/os-specific/windows/cygwin-setup/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix index 16b07507695..91dad81f1f5 100644 --- a/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkgconfig -, zlib, bzip2, lzma, libgcrypt +{ lib, stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkg-config +, zlib, bzip2, xz, libgcrypt }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "cygwin-setup"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "024wxaaxkf7p1i78bh5xrsqmfz7ss2amigbfl2r5w9h87zqn9aq3"; }; - nativeBuildInputs = [ autoconf automake libtool flex bison pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool flex bison pkg-config ]; buildInputs = let mkStatic = flip overrideDerivation (o: { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = map mkStatic (o.buildInputs or []); propagatedBuildInputs = map mkStatic (o.propagatedBuildInputs or []); }); - in map mkStatic [ zlib bzip2 lzma libgcrypt ]; + in map mkStatic [ zlib bzip2 xz libgcrypt ]; configureFlags = [ "--disable-shared" ]; |