diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-18 01:16:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-18 01:16:03 +0000 |
| commit | b7f20dcd026426f900d81b76391d402049b96ca8 (patch) | |
| tree | 3dde395aac1b900f15ac668e5fd779837d4f943c /pkgs/development/ruby-modules/gem-config/default.nix | |
| parent | 4bdb892722454a6d97ad2b72d5ddb5cbe2f2e420 (diff) | |
| parent | 3fc28a93b0091a7ec1b6f6e5110a6cfa92d6dd0a (diff) | |
| download | nixpkgs-b7f20dcd026426f900d81b76391d402049b96ca8.tar nixpkgs-b7f20dcd026426f900d81b76391d402049b96ca8.tar.gz nixpkgs-b7f20dcd026426f900d81b76391d402049b96ca8.tar.bz2 nixpkgs-b7f20dcd026426f900d81b76391d402049b96ca8.tar.lz nixpkgs-b7f20dcd026426f900d81b76391d402049b96ca8.tar.xz nixpkgs-b7f20dcd026426f900d81b76391d402049b96ca8.tar.zst nixpkgs-b7f20dcd026426f900d81b76391d402049b96ca8.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/ruby-modules/gem-config/default.nix')
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 3f91cdfebc8..70cb7e3ca39 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -265,7 +265,7 @@ in hitimes = attrs: { buildInputs = - stdenv.lib.optionals stdenv.isDarwin + lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; }; @@ -515,7 +515,7 @@ in --replace "gobject-2.0" "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}" substituteInPlace lib/vips.rb \ - --replace "vips_libname = 'vips'" "vips_libname = '${stdenv.lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'" + --replace "vips_libname = 'vips'" "vips_libname = '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; }; @@ -632,7 +632,7 @@ in }; zookeeper = attrs: { - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ]; dontBuild = false; postPatch = '' sed -i ext/extconf.rb -e "4a \ |