diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-08-26 10:20:06 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-08-26 16:50:55 +0200 |
| commit | d61c46c1bd79ff08cd1dac34925a92363e6d2031 (patch) | |
| tree | 1508be18ee8baec8b5494c357e960794dcba37c4 /pkgs/misc | |
| parent | b4d8bb5626fa7a2e380aa2179a809f153e2b645c (diff) | |
| download | nixlib-d61c46c1bd79ff08cd1dac34925a92363e6d2031.tar nixlib-d61c46c1bd79ff08cd1dac34925a92363e6d2031.tar.gz nixlib-d61c46c1bd79ff08cd1dac34925a92363e6d2031.tar.bz2 nixlib-d61c46c1bd79ff08cd1dac34925a92363e6d2031.tar.lz nixlib-d61c46c1bd79ff08cd1dac34925a92363e6d2031.tar.xz nixlib-d61c46c1bd79ff08cd1dac34925a92363e6d2031.tar.zst nixlib-d61c46c1bd79ff08cd1dac34925a92363e6d2031.zip | |
libqglviewer: rename attrname and pkgname from libQGLViewer
Ref. http://nixos.org/nixpkgs/manual/#sec-package-naming
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/freestyle/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/misc/freestyle/patch | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/misc/freestyle/default.nix b/pkgs/misc/freestyle/default.nix index bb3520e300ab..231b8eabb071 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 733f50dbf10e..dae1b66f9bbd 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 |