public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24465 from Ericson2314/no-with-literal

Browse Source 
Get rid of all `with { inherit... }` and just used `let inherit...`
This commit is contained in:
John Ericson
2017-03-30 01:49:37 -06:00
committed by GitHub
parent 2a3cd13d73 4c0d7da183
commit 166fc028a4
19 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/cairo/default.nix
View File

@@ -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";

8
pkgs/development/libraries/freetype/default.nix
View File

@@ -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; {

2
pkgs/development/libraries/gmp/5.1.x.nix
View File

@@ -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";

2
pkgs/development/libraries/gmp/6.x.nix
View File

@@ -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";

2
pkgs/development/libraries/libav/default.nix
View File

@@ -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

2
pkgs/development/libraries/libgsf/default.nix
View File

@@ -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";

2
pkgs/development/libraries/nghttp2/default.nix
View File

@@ -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}";