diff options
| author | Robin Gloster <mail@glob.in> | 2021-05-24 09:55:24 -0500 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2021-05-24 09:55:24 -0500 |
| commit | 4bc5fbef9d159e143fb7e2c3231932e6e76f667c (patch) | |
| tree | e2198f5c552e0667d838b8ec764ddb3a4d8f6dec /pkgs/development/ruby-modules | |
| parent | jq: fix build with structured-attrs on darwin (diff) | |
| parent | Merge pull request #123802 from superherointj/package-virtmanager-bugfix (diff) | |
| download | nixpkgs-origin/structured-attrs.tar.gz | |
Merge remote-tracking branch 'upstream/master' into structured-attrsorigin/structured-attrs
Diffstat (limited to 'pkgs/development/ruby-modules')
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/ruby-modules/solargraph/default.nix | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index a1d27fb94dfe..a7263b662d5d 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -549,13 +549,9 @@ in cd "$(cat $out/nix-support/gem-meta/install-path)" substituteInPlace lib/vips.rb \ - --replace "glib-2.0" "${glib.out}/lib/libglib-2.0${stdenv.hostPlatform.extensions.sharedLibrary}" - - substituteInPlace lib/vips.rb \ - --replace "gobject-2.0" "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}" - - substituteInPlace lib/vips.rb \ - --replace "vips_libname = 'vips'" "vips_libname = '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'" + --replace 'library_name("vips", 42)' '"${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}"' \ + --replace 'library_name("glib-2.0", 0)' '"${glib.out}/lib/libglib-2.0${stdenv.hostPlatform.extensions.sharedLibrary}"' \ + --replace 'library_name("gobject-2.0", 0)' '"${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; }; diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix index e95fb1573dd2..356224c02309 100644 --- a/pkgs/development/ruby-modules/solargraph/default.nix +++ b/pkgs/development/ruby-modules/solargraph/default.nix @@ -11,6 +11,6 @@ bundlerApp { description = "A Ruby language server"; homepage = "https://solargraph.org/"; license = licenses.mit; - maintainers = with maintainers; [ worldofpeace nicknovitski angristan ]; + maintainers = with maintainers; [ nicknovitski angristan ]; }; } |