public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libqglviewer: rename attrname and pkgname from libQGLViewer

Browse Source 
Ref. http://nixos.org/nixpkgs/manual/#sec-package-naming
This commit is contained in:
Bjørn Forsman 2015-08-26 10:20:06 +02:00
parent b4d8bb5626
commit d61c46c1bd
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/libqglviewer/default.nix
View File

@ -1,10 +1,11 @@
{ stdenv, fetchurl, qt4 }: { stdenv, fetchurl, qt4 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libQGLViewer-2.6.3"; name = "libqglviewer-2.6.3";
version = "2.6.3";
src = fetchurl { src = fetchurl {
url = "http://www.libqglviewer.com/src/${name}.tar.gz"; url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz";
sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy"; sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy";
}; };

6
pkgs/misc/freestyle/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt4, libpng, lib3ds, freeglut, libXi, libQGLViewer { stdenv, fetchurl, qt4, libpng, lib3ds, freeglut, libXi, libqglviewer
, swig, python }: , swig, python }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -9,9 +9,9 @@ stdenv.mkDerivation {
sha256 = "1h4880fijmfy0x6dbl9hfri071rpj3lnwfzkxi1qyqhy7zyxy7ga"; 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 = '' buildPhase = ''
export PYTHON_VERSION=2.5 export PYTHON_VERSION=2.5

4
pkgs/misc/freestyle/patch
View File

@ -155,8 +155,8 @@ diff -U3 -r a/src/libconfig.pri b/src/libconfig.pri
- } - }
- } - }
- win32: LIBS *= QGLViewer2.lib - win32: LIBS *= QGLViewer2.lib
+ INCLUDEPATH *= $(libQGLViewer)/include + INCLUDEPATH *= $(libqglviewer)/include
+ LIBS *= -L$(libQGLViewer)/lib -lQGLViewer + LIBS *= -L$(libqglviewer)/lib -lQGLViewer
} }
diff -U3 -r a/src/swig/Makefile b/src/swig/Makefile diff -U3 -r a/src/swig/Makefile b/src/swig/Makefile
--- a/src/swig/Makefile 2008-06-06 22:08:06.000000000 +0200 --- a/src/swig/Makefile 2008-06-06 22:08:06.000000000 +0200

2
pkgs/top-level/all-packages.nix
View File

@ -7093,7 +7093,7 @@ let
libplist = callPackage ../development/libraries/libplist { }; libplist = callPackage ../development/libraries/libplist { };
libQGLViewer = callPackage ../development/libraries/libqglviewer { }; libqglviewer = callPackage ../development/libraries/libqglviewer { };
libre = callPackage ../development/libraries/libre {}; libre = callPackage ../development/libraries/libre {};
librem = callPackage ../development/libraries/librem {}; librem = callPackage ../development/libraries/librem {};