diff options
author | John Ericson <Ericson2314@yahoo.com> | 2017-03-30 01:49:37 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-30 01:49:37 -0600 |
commit | 166fc028a43e3894b9e0c9d5d7b42eaf359cb598 (patch) | |
tree | 2865a514ce14e355172370ab35ea04bc0a1aa5dc /pkgs/development | |
parent | 2a3cd13d732ca8e49518a0314d1e003bf16af0bf (diff) | |
parent | 4c0d7da1837356047aabfed4661daf4307821b75 (diff) | |
download | nixpkgs-166fc028a43e3894b9e0c9d5d7b42eaf359cb598.tar nixpkgs-166fc028a43e3894b9e0c9d5d7b42eaf359cb598.tar.gz nixpkgs-166fc028a43e3894b9e0c9d5d7b42eaf359cb598.tar.bz2 nixpkgs-166fc028a43e3894b9e0c9d5d7b42eaf359cb598.tar.lz nixpkgs-166fc028a43e3894b9e0c9d5d7b42eaf359cb598.tar.xz nixpkgs-166fc028a43e3894b9e0c9d5d7b42eaf359cb598.tar.zst nixpkgs-166fc028a43e3894b9e0c9d5d7b42eaf359cb598.zip |
Merge pull request #24465 from Ericson2314/no-with-literal
Get rid of all `with { inherit... }` and just used `let inherit...`
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/freetype/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/gmp/5.1.x.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/gmp/6.x.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libav/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libgsf/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/nghttp2/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/androidsdk.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/misc/binutils/default.nix | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index e1b87fafd8e..3db8b719f77 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -9,7 +9,7 @@ assert glSupport -> mesa_noglu != null; -with { inherit (stdenv.lib) optional optionals; }; +let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { name = "cairo-1.14.8"; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index f966965fa5f..6a2d226e608 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -9,11 +9,11 @@ useEncumberedCode ? true, }: -with { inherit (stdenv.lib) optional optionals optionalString; }; +let + inherit (stdenv.lib) optional optionals optionalString; + version = "2.7.1"; name = "freetype-" + version; -let version = "2.7.1"; name = "freetype-" + version; in - -stdenv.mkDerivation { +in stdenv.mkDerivation { inherit name; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index b5cd936ce4f..14104b30d12 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, m4, cxx ? true, withStatic ? true }: -with { inherit (stdenv.lib) optional optionalString; }; +let inherit (stdenv.lib) optional optionalString; in let self = stdenv.mkDerivation rec { name = "gmp-5.1.3"; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 4d12ed8a8b1..bb4e40dd3a7 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, m4, cxx ? true, withStatic ? false }: -with { inherit (stdenv.lib) optional optionalString; }; +let inherit (stdenv.lib) optional optionalString; in let self = stdenv.mkDerivation rec { name = "gmp-6.1.1"; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 6d81a284040..e0b4babc970 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -17,7 +17,7 @@ assert faacSupport -> enableUnfree; -with { inherit (stdenv.lib) optional optionals hasPrefix; }; +let inherit (stdenv.lib) optional optionals hasPrefix; in /* ToDo: - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index a22b99be8da..588d0b8dadc 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 , python, perl, gdk_pixbuf, libiconv, libintlOrEmpty }: -with { inherit (stdenv.lib) optionals; }; +let inherit (stdenv.lib) optionals; in stdenv.mkDerivation rec { name = "libgsf-1.14.41"; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 5fb9cc36e96..3033c4301af 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -13,7 +13,7 @@ assert enableAsioLib -> boost != null; assert enableGetAssets -> libxml2 != null; assert enableJemalloc -> jemalloc != null; -with { inherit (stdenv.lib) optional; }; +let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "nghttp2-${version}"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 52a2ab8f36a..7587fb3e0c4 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -7,7 +7,7 @@ }: { platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false, useGooglePlayServices ? false }: -with { inherit (stdenv.lib) makeLibraryPath; }; +let inherit (stdenv.lib) makeLibraryPath; in stdenv.mkDerivation rec { name = "android-sdk-${version}"; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 89faa1d952d..7b71a8e95d9 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -4,7 +4,7 @@ let basename = "binutils-2.28"; in -with { inherit (stdenv.lib) optional optionals optionalString; }; +let inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { name = basename + optionalString (cross != null) "-${cross.config}"; |