From d61c46c1bd79ff08cd1dac34925a92363e6d2031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 26 Aug 2015 10:20:06 +0200
Subject: [PATCH] libqglviewer: rename attrname and pkgname from libQGLViewer

Ref. http://nixos.org/nixpkgs/manual/#sec-package-naming
---
 pkgs/development/libraries/libqglviewer/default.nix | 5 +++--
 pkgs/misc/freestyle/default.nix                     | 6 +++---
 pkgs/misc/freestyle/patch                           | 4 ++--
 pkgs/top-level/all-packages.nix                     | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix
index 829e5f92353..6b40eeb3b1f 100644
--- a/pkgs/development/libraries/libqglviewer/default.nix
+++ b/pkgs/development/libraries/libqglviewer/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "libQGLViewer-2.6.3";
+  name = "libqglviewer-2.6.3";
+  version = "2.6.3";
 
   src = fetchurl {
-    url = "http://www.libqglviewer.com/src/${name}.tar.gz";
+    url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz";
     sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy";
   };
 
diff --git a/pkgs/misc/freestyle/default.nix b/pkgs/misc/freestyle/default.nix
index bb3520e300a..231b8eabb07 100644
--- a/pkgs/misc/freestyle/default.nix
+++ b/pkgs/misc/freestyle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, libpng, lib3ds, freeglut, libXi, libQGLViewer
+{ stdenv, fetchurl, qt4, libpng, lib3ds, freeglut, libXi, libqglviewer
 , swig, python }:
 
 stdenv.mkDerivation {
@@ -9,9 +9,9 @@ stdenv.mkDerivation {
     sha256 = "1h4880fijmfy0x6dbl9hfri071rpj3lnwfzkxi1qyqhy7zyxy7ga";
  };
 
-  buildInputs = [ qt4 libpng lib3ds freeglut libXi libQGLViewer swig ];
+  buildInputs = [ qt4 libpng lib3ds freeglut libXi libqglviewer swig ];
   
-  inherit python freeglut libQGLViewer lib3ds; # if you want to use another adopt patch and Config.pri 
+  inherit python freeglut libqglviewer lib3ds; # if you want to use another adopt patch and Config.pri
 
   buildPhase = ''
     export PYTHON_VERSION=2.5
diff --git a/pkgs/misc/freestyle/patch b/pkgs/misc/freestyle/patch
index 733f50dbf10..dae1b66f9bb 100644
--- a/pkgs/misc/freestyle/patch
+++ b/pkgs/misc/freestyle/patch
@@ -155,8 +155,8 @@ diff -U3 -r a/src/libconfig.pri b/src/libconfig.pri
 -    }
 -  }
 -  win32:    LIBS        *= QGLViewer2.lib
-+  INCLUDEPATH *= $(libQGLViewer)/include
-+  LIBS        *= -L$(libQGLViewer)/lib -lQGLViewer
++  INCLUDEPATH *= $(libqglviewer)/include
++  LIBS        *= -L$(libqglviewer)/lib -lQGLViewer
  }
 diff -U3 -r a/src/swig/Makefile b/src/swig/Makefile
 --- a/src/swig/Makefile	2008-06-06 22:08:06.000000000 +0200
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 887e21a505c..8b031194670 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7093,7 +7093,7 @@ let
 
   libplist = callPackage ../development/libraries/libplist { };
 
-  libQGLViewer = callPackage ../development/libraries/libqglviewer { };
+  libqglviewer = callPackage ../development/libraries/libqglviewer { };
 
   libre = callPackage ../development/libraries/libre {};
   librem = callPackage ../development/libraries/librem {};