about summary refs log tree commit diff
path: root/pkgs/applications/version-management
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-02-25 03:23:58 +0100
committerJan Tojnar <jtojnar@gmail.com>2018-02-25 17:41:16 +0100
commita31d98f3120e0f676303b7fc3e84424e6b325290 (patch)
tree50eed3f28ebcae3fc1d7e6676d7446e8b55e2f53 /pkgs/applications/version-management
parent20c5476a8bf09330e438f6d083bd4e197fefd17e (diff)
downloadnixlib-a31d98f3120e0f676303b7fc3e84424e6b325290.tar
nixlib-a31d98f3120e0f676303b7fc3e84424e6b325290.tar.gz
nixlib-a31d98f3120e0f676303b7fc3e84424e6b325290.tar.bz2
nixlib-a31d98f3120e0f676303b7fc3e84424e6b325290.tar.lz
nixlib-a31d98f3120e0f676303b7fc3e84424e6b325290.tar.xz
nixlib-a31d98f3120e0f676303b7fc3e84424e6b325290.tar.zst
nixlib-a31d98f3120e0f676303b7fc3e84424e6b325290.zip
tree-wide: autorename gnome packages to use dashes
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r--pkgs/applications/version-management/gitkraken/default.nix6
-rw-r--r--pkgs/applications/version-management/meld/default.nix2
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index c7f7a4b02e4d..93b96dd87460 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, libXcomposite, libgnome_keyring, makeWrapper, udev, curl, alsaLib
+{ stdenv, lib, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib
 , libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig
 , libX11, libXi, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
 , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     libXrender
     gtk2
     gnome2.GConf
-    libgnome_keyring
+    libgnome-keyring
   ];
 
   nativeBuildInputs = [ makeWrapper ];
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
              --set-rpath "$libPath:$out/opt/gitkraken" "$out/opt/gitkraken/gitkraken"
     wrapProgram $out/opt/gitkraken/gitkraken \
       --prefix LD_PRELOAD : "${makeLibraryPath [ curl ]}/libcurl.so.4" \
-      --prefix LD_PRELOAD : "${makeLibraryPath [ libgnome_keyring ]}/libgnome-keyring.so.0"
+      --prefix LD_PRELOAD : "${makeLibraryPath [ libgnome-keyring ]}/libgnome-keyring.so.0"
     mkdir "$out/bin"
     ln -s "$out/opt/gitkraken/gitkraken" "$out/bin/gitkraken"
   '';
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index d5bd24cf9382..18e986e437f6 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -17,7 +17,7 @@ in buildPythonApplication rec {
 
   buildInputs = [
     intltool wrapGAppsHook itstool libxml2
-    gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo
+    gnome3.gtksourceview gnome3.gsettings-desktop-schemas pycairo cairo
     gnome3.defaultIconTheme gnome3.dconf file
   ];
   propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ];