gdk-pixbuf: rename from gdk_pixbuf

5 files changed, 18 insertions, 18 deletions

diff --git a/pkgs/development/python-modules/cairocffi/0_9.nix b/pkgs/development/python-modules/cairocffi/0_9.nix
index 19a469dad26..bd7bde42901 100644
--- a/pkgs/development/python-modules/cairocffi/0_9.nix
+++ b/pkgs/development/python-modules/cairocffi/0_9.nix
@@ -1,4 +1,4 @@
-# FIXME: make gdk_pixbuf dependency optional
+# FIXME: make gdk-pixbuf dependency optional
 { stdenv
 , buildPythonPackage
 , pythonOlder
@@ -15,7 +15,7 @@
 , withXcffib ? false, xcffib
 , python
 , glib
-, gdk_pixbuf
+, gdk-pixbuf
 }@args:
 
 import ./generic.nix ({
diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix
index 528c845c07e..f91b33d2010 100644
--- a/pkgs/development/python-modules/cairocffi/default.nix
+++ b/pkgs/development/python-modules/cairocffi/default.nix
@@ -1,4 +1,4 @@
-# FIXME: make gdk_pixbuf dependency optional
+# FIXME: make gdk-pixbuf dependency optional
 { stdenv
 , buildPythonPackage
 , pythonOlder
@@ -15,7 +15,7 @@
 , withXcffib ? false, xcffib
 , python
 , glib
-, gdk_pixbuf
+, gdk-pixbuf
 }@args:
 
 import ./generic.nix ({
diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch
index 862f7bd4bf7..a1018e6eb33 100644
--- a/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch
+++ b/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch
@@ -3,7 +3,7 @@ Author: Alexander V. Nikolaev <avn@avnik.info>
 Date:   Sat Feb 6 08:09:06 2016 +0200
 
     Patch dlopen() to allow direct paths to all required libs
-    
+
     This patch is NixOS specific
 
 diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py
@@ -13,15 +13,15 @@ index 718aa7f..1a1dcff 100644
 @@ -27,20 +27,22 @@ VERSION = '0.7.2'
  version = '1.10.0'
  version_info = (1, 10, 0)
- 
+
 +# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime
 +_LIBS = {
 +    'cairo': '@cairo@/lib/libcairo@ext@',
 +    'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
 +    'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
-+    'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
++    'gdk-pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
 +}
- 
+
 -def dlopen(ffi, *names):
 +def dlopen(ffi, name, *names):
      """Try various names for the same library, for different platforms."""
@@ -42,6 +42,6 @@ index 718aa7f..1a1dcff 100644
 +        if lib:
 +            return lib
 +    raise OSError("dlopen() failed to load a library: %s as %s" % (name, path))
- 
- 
+
+
  cairo = dlopen(ffi, 'cairo', 'cairo-2')
diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
index d42b8bcce48..9fd2832b323 100644
--- a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
+++ b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
@@ -3,7 +3,7 @@ Author: Alexander V. Nikolaev <avn@avnik.info>
 Date:   Sat Feb 6 08:09:06 2016 +0200
 
     Patch dlopen() to allow direct paths to all required libs
-    
+
     This patch is NixOS specific
 
 diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py
@@ -13,15 +13,15 @@ index 6061973..3538a58 100644
 @@ -21,19 +21,22 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip()
  version = '1.16.0'
  version_info = (1, 16, 0)
- 
+
 +# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime
 +_LIBS = {
 +    'cairo': '@cairo@/lib/libcairo@ext@',
 +    'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
 +    'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
-+    'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
++    'gdk-pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
 +}
- 
+
 -def dlopen(ffi, *names):
 +def dlopen(ffi, name, *names):
      """Try various names for the same library, for different platforms."""
@@ -41,6 +41,6 @@ index 6061973..3538a58 100644
 +        if lib:
 +            return lib
 +    raise OSError("dlopen() failed to load a library: %s as %s" % (name, path))
- 
- 
+
+
  cairo = dlopen(ffi, 'cairo', 'cairo-2', 'cairo-gobject-2', 'cairo.so.2')
diff --git a/pkgs/development/python-modules/cairocffi/generic.nix b/pkgs/development/python-modules/cairocffi/generic.nix
index 4fa5cc466c3..cf1618a865b 100644
--- a/pkgs/development/python-modules/cairocffi/generic.nix
+++ b/pkgs/development/python-modules/cairocffi/generic.nix
@@ -31,13 +31,13 @@ buildPythonPackage rec {
   '';
 
   patches = [
-    # OSError: dlopen() failed to load a library: gdk_pixbuf-2.0 / gdk_pixbuf-2.0-0
+    # OSError: dlopen() failed to load a library: gdk-pixbuf-2.0 / gdk-pixbuf-2.0-0
     (substituteAll {
       src = dlopen_patch;
       ext = stdenv.hostPlatform.extensions.sharedLibrary;
       cairo = cairo.out;
       glib = glib.out;
-      gdk_pixbuf = gdk_pixbuf.out;
+      gdk_pixbuf = gdk-pixbuf.out;
     })
     ./fix_test_scaled_font.patch
   ];