[Nix-dev] [nix-dev] oxygen gtk theming
Hi. I've installed oxygen-gtk theme and tried to switch it on by linking [ierton@pokemon:~]$ ls -l .gtkrc-2.0.mine lrwxrwxrwx 1 ierton users 64 Янв 13 13:55 .gtkrc-2.0.mine - /var/run/current-system/sw/share/themes/oxygen-gtk/gtk-2.0/gtkrc (.gtkrc-2.0.mine is included from .gtkrc-2.0) It works, partly. Now all my gtk apps issue a warning /nix/store/nb08bx0r8hj14l9gf7xprv1kb0vy1w2m-wicd-1.7.1-beta2/share/gtk/gui.py:152: GtkWarning: Unable to locate theme engine in module_path: oxygen-gtk, and some parts of interface look ugly. Well, I am not a gtk expert. Lxappearance app (not in tree, i've installed it locally) didn't help - it couldn't detect the presence of oxygen theme in my system. Does anybody know a better way of setting things up? Sergey ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] synaptic driver broken + fix
Hi Arie,
Commit https://nixos.org/repos/nix/nixos/trunk@31523 contained a small
mistake, leading to a crash while building:
value is a string while a Boolean was expected
I attached the fix, can you commit it?
Thanks,
Mathijs
diff --git a/modules/services/x11/hardware/synaptics.nix b/modules/services/x11/hardware/synaptics.nix
index e8c839d..a2087f2 100644
--- a/modules/services/x11/hardware/synaptics.nix
+++ b/modules/services/x11/hardware/synaptics.nix
@@ -53,7 +53,7 @@ let cfg = config.services.xserver.synaptics; in
};
palmDetect = mkOption {
-default = ;
+default = false;
example = true;
description = Whether to enable palm detection (hardware support required);
};
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r31529 - nixos/trunk/modules/services/x11/hardware
Author: amiddelk
Date: Sat Jan 14 09:40:08 2012
New Revision: 31529
URL: https://nixos.org/websvn/nix/?rev=31529sc=1
Log:
Fixed the default value for the palmDetect synaptics option (empty string -
false).
Modified:
nixos/trunk/modules/services/x11/hardware/synaptics.nix
Modified: nixos/trunk/modules/services/x11/hardware/synaptics.nix
==
--- nixos/trunk/modules/services/x11/hardware/synaptics.nix Sat Jan 14
09:31:12 2012(r31528)
+++ nixos/trunk/modules/services/x11/hardware/synaptics.nix Sat Jan 14
09:40:08 2012(r31529)
@@ -53,7 +53,7 @@
};
palmDetect = mkOption {
-default = ;
+default = false;
example = true;
description = Whether to enable palm detection (hardware support
required);
};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31530 - in nixpkgs/trunk/pkgs: applications/version-management/subversion top-level
Author: simons
Date: Sat Jan 14 11:41:06 2012
New Revision: 31530
URL: https://nixos.org/websvn/nix/?rev=31530sc=1
Log:
subversion: add sasl support
Modified:
nixpkgs/trunk/pkgs/applications/version-management/subversion/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/subversion/default.nix
==
--- nixpkgs/trunk/pkgs/applications/version-management/subversion/default.nix
Sat Jan 14 09:40:08 2012(r31529)
+++ nixpkgs/trunk/pkgs/applications/version-management/subversion/default.nix
Sat Jan 14 11:41:06 2012(r31530)
@@ -6,8 +6,10 @@
, pythonBindings ? false
, perlBindings ? false
, javahlBindings ? false
+, saslSupport ? false
, stdenv, fetchurl, apr, aprutil, neon, zlib, sqlite
, httpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
+, sasl ? null
}:
assert bdbSupport - aprutil.bdbSupport;
@@ -31,7 +33,8 @@
buildInputs = [ zlib apr aprutil sqlite ]
++ stdenv.lib.optional httpSupport neon
++ stdenv.lib.optional pythonBindings python
-++ stdenv.lib.optional perlBindings perl;
+++ stdenv.lib.optional perlBindings perl
+++ stdenv.lib.optional saslSupport sasl;
configureFlags = ''
${if bdbSupport then --with-berkeley-db else --without-berkeley-db}
@@ -39,8 +42,10 @@
${if pythonBindings || perlBindings then --with-swig=${swig} else
--without-swig}
${if javahlBindings then --enable-javahl --with-jdk=${jdk} else }
${if stdenv.isDarwin then --enable-keychain else --disable-keychain}
+${if saslSupport then --enable-sasl else --disable-sasl}
--with-zlib=${zlib}
--with-sqlite=${sqlite}
+--with-sasl=${sasl}
'';
preBuild = ''
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 14 09:40:08
2012(r31529)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 14 11:41:06
2012(r31530)
@@ -7418,8 +7418,10 @@
pythonBindings = false;
perlBindings = false;
javahlBindings = false;
+saslSupport = false;
compressionSupport = true;
httpd = apacheHttpd;
+sasl = cyrus_sasl;
};
subversionClient = lowPrio (appendToName client (subversion.override {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] [nix-dev] oxygen gtk theming
Sergey Mironov ier...@gmail.com writes: Hi. I've installed oxygen-gtk theme and tried to switch it on by linking [ierton@pokemon:~]$ ls -l .gtkrc-2.0.mine lrwxrwxrwx 1 ierton users 64 Янв 13 13:55 .gtkrc-2.0.mine - /var/run/ current-system/sw/share/themes/oxygen-gtk/gtk-2.0/gtkrc (.gtkrc-2.0.mine is included from .gtkrc-2.0) It works, partly. Now all my gtk apps issue a warning /nix/store/nb08bx0r8hj14l9gf7xprv1kb0vy1w2m-wicd-1.7.1-beta2/share/gtk/ gui.py:152: GtkWarning: Unable to locate theme engine in module_path: oxygen-gtk, and some parts of interface look ugly. Well, I am not a gtk expert. Lxappearance app (not in tree, i've installed it locally) didn't help - it couldn't detect the presence of oxygen theme in my system. Does anybody know a better way of setting things up? I tried the same with murrine a long time ago with the same result. It seems we need to patch GTK+ to help it find paths to theme engines for ex. from environment variable. -- Александр Цамутали ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r31531 - nixpkgs/trunk/pkgs/servers/sql/mysql51
Author: shlevy
Date: Sat Jan 14 11:58:29 2012
New Revision: 31531
URL: https://nixos.org/websvn/nix/?rev=31531sc=1
Log:
mysql51: enable building on darwin
Modified:
nixpkgs/trunk/pkgs/servers/sql/mysql51/default.nix
Modified: nixpkgs/trunk/pkgs/servers/sql/mysql51/default.nix
==
--- nixpkgs/trunk/pkgs/servers/sql/mysql51/default.nix Sat Jan 14 11:41:06
2012(r31530)
+++ nixpkgs/trunk/pkgs/servers/sql/mysql51/default.nix Sat Jan 14 11:58:29
2012(r31531)
@@ -10,7 +10,7 @@
sha256 = 07xbnwk7h1xya8s6dw34nrv7ampzag8l0l1szd2pc9zyqkzhydw4;
};
- buildInputs = [ps ncurses zlib perl openssl];
+ buildInputs = [ncurses zlib perl openssl] ++ stdenv.lib.optional
stdenv.isLinux ps;
configureFlags = --enable-thread-safe-client --with-ssl=${openssl}
--with-embedded-server --with-plugins=max-no-ndb +
(if stdenv.system == x86_64-linux then --with-lib-ccflags=-fPIC else
);
@@ -30,5 +30,6 @@
meta = {
homepage = http://www.mysql.com/;
description = The world's most popular open source database;
+platforms = stdenv.lib.platforms.all;
};
}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31532 - nixpkgs/trunk/pkgs/applications/version-management/subversion
Author: simons
Date: Sat Jan 14 12:05:18 2012
New Revision: 31532
URL: https://nixos.org/websvn/nix/?rev=31532sc=1
Log:
subversion: instantiate SASL only when it's actually enabled
Modified:
nixpkgs/trunk/pkgs/applications/version-management/subversion/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/subversion/default.nix
==
--- nixpkgs/trunk/pkgs/applications/version-management/subversion/default.nix
Sat Jan 14 11:58:29 2012(r31531)
+++ nixpkgs/trunk/pkgs/applications/version-management/subversion/default.nix
Sat Jan 14 12:05:18 2012(r31532)
@@ -42,10 +42,9 @@
${if pythonBindings || perlBindings then --with-swig=${swig} else
--without-swig}
${if javahlBindings then --enable-javahl --with-jdk=${jdk} else }
${if stdenv.isDarwin then --enable-keychain else --disable-keychain}
-${if saslSupport then --enable-sasl else --disable-sasl}
+${if saslSupport then --enable-sasl --with-sasl=${sasl} else
--disable-sasl}
--with-zlib=${zlib}
--with-sqlite=${sqlite}
---with-sasl=${sasl}
'';
preBuild = ''
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31533 - nixpkgs/trunk/pkgs/development/libraries/mesa
Author: simons
Date: Sat Jan 14 12:09:09 2012
New Revision: 31533
URL: https://nixos.org/websvn/nix/?rev=31533sc=1
Log:
mesa: updated to version 7.11.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix Sat Jan 14
12:05:18 2012(r31532)
+++ nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix Sat Jan 14
12:09:09 2012(r31533)
@@ -1,37 +1,37 @@
-{ stdenv, fetchurl, flex, bison, pkgconfig, x11, xlibs, libdrm, file, expat
+{ stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend
+, libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb,
libXext
+, libXt, udev
, python, libxml2Python, lipo ? null }:
if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms
then
throw unsupported platform for Mesa
else
-let version = 7.10.3; in
+let version = 7.11.2; in
stdenv.mkDerivation {
name = mesa-${version};
src = fetchurl {
url =
ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2;;
-sha256 = 1h451vgsfsp0h0wig66spqgxmjalsy28gvd9viynfwmq7741yw0y;
+sha256 = 0msk1fh4yw4yi7z37v75vhpa23z49lkwgin6drczbihbqsl6lx2p;
};
patches = [ ./swrast-settexbuffer.patch ];
- postPatch = ''
-find . -name *.py -exec sed -i -e s|#! */usr/bin/env python|#!
${python}/bin/python| {} +
- '';
+ prePatch = patchShebangs .;
+# r300
configureFlags =
--with-driver=dri --enable-gl-osmesa --enable-gles1
-+ --enable-gallium --enable-gallium-r600 --enable-gles2
-+ --enable-gallium-swrast --enable-gallium-egl --disable-glx-tls
++ --with-gallium-drivers=i915,i965,nouveau,r600,svga,swrast
++ --enable-gles2 --enable-gallium-egl --disable-glx-tls
+ --enable-xcb --enable-egl --disable-glut;
- buildInputs =
-[ pkgconfig expat x11 libdrm xlibs.makedepend xlibs.glproto
- xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
- lipo file python libxml2Python flex bison
-];
+ buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto
dri2proto
+libxml2Python libX11 libXext libxcb lipo libXt udev ];
+
+ buildNativeInputs = [ pkgconfig python makedepend file flex bison ];
enableParallelBuilding = true;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31536 - nixpkgs/trunk/pkgs/development/libraries/mesa
Author: simons
Date: Sat Jan 14 12:13:51 2012
New Revision: 31536
URL: https://nixos.org/websvn/nix/?rev=31536sc=1
Log:
Revert mesa: updated to version 7.11.2
This reverts commit b18ddb0ac8bc232df2cfd2980bd22ee9beae7b12.
Modified:
nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix Sat Jan 14
12:09:20 2012(r31535)
+++ nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix Sat Jan 14
12:13:51 2012(r31536)
@@ -1,37 +1,37 @@
-{ stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend
-, libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb,
libXext
-, libXt, udev
+{ stdenv, fetchurl, flex, bison, pkgconfig, x11, xlibs, libdrm, file, expat
, python, libxml2Python, lipo ? null }:
if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms
then
throw unsupported platform for Mesa
else
-let version = 7.11.2; in
+let version = 7.10.3; in
stdenv.mkDerivation {
name = mesa-${version};
src = fetchurl {
url =
ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2;;
-sha256 = 0msk1fh4yw4yi7z37v75vhpa23z49lkwgin6drczbihbqsl6lx2p;
+sha256 = 1h451vgsfsp0h0wig66spqgxmjalsy28gvd9viynfwmq7741yw0y;
};
patches = [ ./swrast-settexbuffer.patch ];
- prePatch = patchShebangs .;
+ postPatch = ''
+find . -name *.py -exec sed -i -e s|#! */usr/bin/env python|#!
${python}/bin/python| {} +
+ '';
-# r300
configureFlags =
--with-driver=dri --enable-gl-osmesa --enable-gles1
-+ --with-gallium-drivers=i915,i965,nouveau,r600,svga,swrast
-+ --enable-gles2 --enable-gallium-egl --disable-glx-tls
++ --enable-gallium --enable-gallium-r600 --enable-gles2
++ --enable-gallium-swrast --enable-gallium-egl --disable-glx-tls
+ --enable-xcb --enable-egl --disable-glut;
- buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto
dri2proto
-libxml2Python libX11 libXext libxcb lipo libXt udev ];
-
- buildNativeInputs = [ pkgconfig python makedepend file flex bison ];
+ buildInputs =
+[ pkgconfig expat x11 libdrm xlibs.makedepend xlibs.glproto
+ xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
+ lipo file python libxml2Python flex bison
+];
enableParallelBuilding = true;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31538 - nixos/trunk/modules/services/x11/hardware
Author: amiddelk
Date: Sat Jan 14 12:24:41 2012
New Revision: 31538
URL: https://nixos.org/websvn/nix/?rev=31538sc=1
Log:
Another type error fix (The example shouldn't be a string either).
Modified:
nixos/trunk/modules/services/x11/hardware/synaptics.nix
Modified: nixos/trunk/modules/services/x11/hardware/synaptics.nix
==
--- nixos/trunk/modules/services/x11/hardware/synaptics.nix Sat Jan 14
12:13:53 2012(r31537)
+++ nixos/trunk/modules/services/x11/hardware/synaptics.nix Sat Jan 14
12:24:41 2012(r31538)
@@ -48,13 +48,13 @@
tapButtons = mkOption {
default = true;
-example = false;
+example = false;
description = Whether to enable tap buttons.;
};
palmDetect = mkOption {
default = false;
-example = true;
+example = true;
description = Whether to enable palm detection (hardware support
required);
};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] fetching a single file (not an archive)
Excerpts from Mathijs Kwik's message of Sat Jan 14 16:11:43 +0100 2012:
With my limited knowledge of nix, I use fetchurl, which then complains
about unknown archive type.
You should grep nixpkgs for the error message. Then you'll understand
that not fetchurl yells about the achive type - its the unpackPhase of
the default build script.
You can disable it by
a) not using src env var
eg
mkDerivation {
installPhase = ''
ensureDir $out/bi
cp ${fetchurl{ ...}} $out/bin
chmod +x $out/bin
'';
}
Note that there are shortcuts like writeScript or runCommand or such.
b) overwriting it
unpackcPhase = :;
c) overwrite phases
phases= everyhting but unpackPhase;
I recommend a) or b)
Marc Weber
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] freenet6, password, seccureKeys
Hi all, I'm confused by the gw6c service. I have a freenet6 account with a username and a password (no public/private key stuff). As I don't want to store the password in nix configuration, I was hoping to use builtins.readFile /some/secure/place as the password option. However, it seems gw6c is also expecting some strange public/private key settings (security.seccureKeys). Does anyone know how to proceed? Thanks, Mathijs ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r31539 - nixpkgs/trunk/pkgs/development/libraries/libical
Author: urkud
Date: Sat Jan 14 18:02:46 2012
New Revision: 31539
URL: https://nixos.org/websvn/nix/?rev=31539sc=1
Log:
libical-0.48
Modified:
nixpkgs/trunk/pkgs/development/libraries/libical/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/libical/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/libical/default.nixSat Jan
14 12:24:41 2012(r31538)
+++ nixpkgs/trunk/pkgs/development/libraries/libical/default.nixSat Jan
14 18:02:46 2012(r31539)
@@ -1,10 +1,10 @@
{stdenv, fetchurl, perl}:
stdenv.mkDerivation rec {
- name = libical-0.47;
+ name = libical-0.48;
src = fetchurl {
url = mirror://sourceforge/freeassociation/${name}.tar.gz;
-sha256 = 1218vaaks9lvx31mrc8212kyngw2k68xm0914vrd77ixn55vnk5g;
+sha256 = 1w6znkh0xxhbcm717mbzfva9ycrqs2lajhng391i7pghaw3qprra;
};
buildNativeInputs = [ perl ];
}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31541 - nixpkgs/trunk/pkgs/applications/science/chemistry/avogadro
Author: urkud
Date: Sat Jan 14 18:03:01 2012
New Revision: 31541
URL: https://nixos.org/websvn/nix/?rev=31541sc=1
Log:
avogadro: explicitly depend on pkg-config
Modified:
nixpkgs/trunk/pkgs/applications/science/chemistry/avogadro/default.nix
Modified: nixpkgs/trunk/pkgs/applications/science/chemistry/avogadro/default.nix
==
--- nixpkgs/trunk/pkgs/applications/science/chemistry/avogadro/default.nix
Sat Jan 14 18:02:54 2012(r31540)
+++ nixpkgs/trunk/pkgs/applications/science/chemistry/avogadro/default.nix
Sat Jan 14 18:03:01 2012(r31541)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel }:
+{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig }:
stdenv.mkDerivation rec {
name = avogadro-1.0.3;
@@ -10,7 +10,7 @@
buildInputs = [ qt4 eigen zlib openbabel ];
- buildNativeInputs = [ cmake ];
+ buildNativeInputs = [ cmake pkgconfig ];
meta = {
maintainers = [ stdenv.lib.maintainers.urkud ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31545 - nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-baseapps
Author: urkud
Date: Sat Jan 14 18:03:17 2012
New Revision: 31545
URL: https://nixos.org/websvn/nix/?rev=31545sc=1
Log:
konsole: depend on kde-baseapps for libkonq
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-baseapps/konsole.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-baseapps/konsole.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-baseapps/konsole.nixSat Jan
14 18:03:12 2012(r31544)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-baseapps/konsole.nixSat Jan
14 18:03:17 2012(r31545)
@@ -1,8 +1,8 @@
-{ kde, kdelibs }:
+{ kde, kdelibs, kde_baseapps }:
kde {
- buildInputs = [ kdelibs ];
+ buildInputs = [ kdelibs kde_baseapps ];
meta = {
description = Konsole, the KDE terminal emulator;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31546 - nixpkgs/trunk/pkgs/desktops/kde-4.8
Author: urkud
Date: Sat Jan 14 18:03:20 2012
New Revision: 31546
URL: https://nixos.org/websvn/nix/?rev=31546sc=1
Log:
kde48.kdepim: depend on prison
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdepim.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/kdepim.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/kdepim.nix Sat Jan 14 18:03:17
2012(r31545)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kdepim.nix Sat Jan 14 18:03:20
2012(r31546)
@@ -1,11 +1,11 @@
{ kde, boost, gpgme, libassuan, libxml2, libxslt, kdepimlibs, kdepim_runtime
-, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee }:
+, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison }:
kde {
buildInputs =
[ kdepimlibs boost akonadi shared_desktop_ontologies libxml2
- libxslt cyrus_sasl gpgme libassuan grantlee
+ libxslt cyrus_sasl gpgme libassuan grantlee prison
];
passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31550 - nixpkgs/trunk/pkgs/development/libraries/ntrack
Author: urkud
Date: Sat Jan 14 18:03:34 2012
New Revision: 31550
URL: https://nixos.org/websvn/nix/?rev=31550sc=1
Log:
ntrack-016, add meta
Modified:
nixpkgs/trunk/pkgs/development/libraries/ntrack/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/ntrack/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/ntrack/default.nix Sat Jan 14
18:03:31 2012(r31549)
+++ nixpkgs/trunk/pkgs/development/libraries/ntrack/default.nix Sat Jan 14
18:03:34 2012(r31550)
@@ -1,8 +1,7 @@
-{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python, automake
-, autoconf }:
+{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python }:
let
- version = 014;
+ version = 016;
in
stdenv.mkDerivation rec {
@@ -10,32 +9,21 @@
src = fetchurl {
url =
http://launchpad.net/ntrack/main/${version}/+download/${name}.tar.gz;;
-sha256 = 1aqn3q0dj2kk0j9rf02qgbfghlykaas7q0g8wxyz7nd6zg4qhyj2;
+sha256 = 037ig5y0mp327m0hh4pnfr3vmsk3wrxgfjy3645q4ws9vdhx807w;
};
buildInputs = [ libnl qt4 ];
- buildNativeInputs = [ pkgconfig python automake autoconf ];
+ buildNativeInputs = [ pkgconfig python ];
configureFlags = --without-gobject CFLAGS=--std=gnu99;
- patchP0 = fetchurl {
-url = http://bazaar.launchpad.net/~asac/ntrack/main/diff/312/309;
-name = ntrack-bzr-309-to-312.patch;
-sha256 = 1bpjpikln2i7nsmd2gl82g08yzaqac311sgsva7z7pqccxz0vsj5;
- };
+ patchPhase = ''sed -e s@/usr\(/lib/ntrack/modules/\)@$out@ -i
common/ntrack.c'';
- patchP1 = fetchurl {
-url =
https://bugs.launchpad.net/ntrack/+bug/750554/+attachment/2291609/+files/ntrack_libnl_link.diff;;
-sha256 = 1al6wfjph7nmck1q2q2z98cnzcrwpln2wwh45xynsxr6wgczwck6;
+ meta = {
+description = Network Connectivity Tracking library for Desktop
Applications;
+homepage = https://launchpad.net/ntrack;
+platforms = stdenv.lib.platforms.linux;
+maintainers = [ stdenv.lib.maintainers.urkud ];
};
-
- patchPhase =
-''
- patch -p0 ${patchP0}
- patch -p1 ${patchP1}
- sed -e s@/usr\(/lib/ntrack/modules/\)@$out@ -i common/ntrack.c
-'';
-
- preConfigure = automake; # The second patch changes Makefile.am files
}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31551 - nixpkgs/trunk/pkgs/development/libraries/libgadu
Author: urkud
Date: Sat Jan 14 18:03:38 2012
New Revision: 31551
URL: https://nixos.org/websvn/nix/?rev=31551sc=1
Log:
Propagate zlib
Modified:
nixpkgs/trunk/pkgs/development/libraries/libgadu/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/libgadu/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/libgadu/default.nixSat Jan
14 18:03:34 2012(r31550)
+++ nixpkgs/trunk/pkgs/development/libraries/libgadu/default.nixSat Jan
14 18:03:38 2012(r31551)
@@ -9,7 +9,7 @@
sha256 = 045a0bd395k3ramdvlzyfx3878p42fv4r04rgasmdsm2n33wgm38;
};
- buildInputs = [ zlib ];
+ propagatedBuildInputs = [ zlib ];
meta = {
description = A library to deal with gadu-gadu protocol (most popular
polish IM protocol);
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31553 - nixpkgs/trunk/pkgs/desktops/kde-4.8
Author: urkud
Date: Sat Jan 14 18:03:45 2012
New Revision: 31553
URL: https://nixos.org/websvn/nix/?rev=31553sc=1
Log:
Fix kde48.kde_workspace FTBFS
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-workspace.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-workspace.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-workspace.nix Sat Jan 14
18:03:41 2012(r31552)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-workspace.nix Sat Jan 14
18:03:45 2012(r31553)
@@ -1,20 +1,23 @@
{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies,
lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate,
consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi,
- pykde4
+ pykde4, libjpeg, pkgconfig, libXft, libXxf86misc, kactivities
}:
kde {
buildInputs =
-[ kdelibs qimageblitz libdbusmenu_qt pykde4
+[ kdelibs qimageblitz libdbusmenu_qt pykde4 libjpeg libXft libXxf86misc
xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst
xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
xorg.libpthreadstubs
boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394
libusb python libqalculate consolekit kdepimlibs pam prison akonadi
+ kactivities
];
+ buildNativeInputs = [ pkgconfig ];
+
preConfigure =
''
# Fix incorrect path to kde4-config.
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31554 - nixpkgs/trunk/pkgs/desktops/kde-4.8
Author: urkud
Date: Sat Jan 14 18:03:48 2012
New Revision: 31554
URL: https://nixos.org/websvn/nix/?rev=31554sc=1
Log:
Pass sqlite and pkgconfig to kdegames
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdegames.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/kdegames.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/kdegames.nixSat Jan 14 18:03:45
2012(r31553)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kdegames.nixSat Jan 14 18:03:48
2012(r31554)
@@ -1,12 +1,14 @@
{ kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, pykde4,
- openal, libsndfile, qhull }:
+ openal, libsndfile, qhull, sqlite, pkgconfig }:
kde rec {
buildInputs = [ kdelibs qca2 pythonPackages.python pythonPackages.wrapPython
-openal libsndfile qhull ] ++ pythonPath;
+openal libsndfile qhull sqlite ] ++ pythonPath;
pythonPath = [ pythonPackages.twisted pykde4 ];
+ buildNativeInputs = [ pkgconfig ];
+
# TODO: ggz
postInstall = wrapPythonPrograms;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31556 - nixpkgs/trunk/pkgs/desktops/kde-4.8/kdegraphics
Author: urkud
Date: Sat Jan 14 18:03:56 2012
New Revision: 31556
URL: https://nixos.org/websvn/nix/?rev=31556sc=1
Log:
libkdcraw: depend o libjpeg and lcms1
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix Sat Jan
14 18:03:53 2012(r31555)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix Sat Jan
14 18:03:56 2012(r31556)
@@ -1,7 +1,7 @@
-{ kde, kdelibs }:
+{ kde, kdelibs, libjpeg, lcms1 }:
kde {
- buildInputs = [ kdelibs ];
+ buildInputs = [ kdelibs libjpeg lcms1 ];
meta = {
description = Library for decoding RAW images;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31557 - nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeaccessibility
Author: urkud
Date: Sat Jan 14 18:04:00 2012
New Revision: 31557
URL: https://nixos.org/websvn/nix/?rev=31557sc=1
Log:
kmousetool depends on libXt
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix Sat Jan
14 18:03:56 2012(r31556)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix Sat Jan
14 18:04:00 2012(r31557)
@@ -1,7 +1,7 @@
-{ kde, kdelibs, libXtst }:
+{ kde, kdelibs, libXtst, libXt }:
kde {
- buildInputs = [ kdelibs libXtst ];
+ buildInputs = [ kdelibs libXtst libXt ];
meta = {
description = A program that clicks the mouse for you;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31558 - nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeartwork
Author: urkud
Date: Sat Jan 14 18:04:03 2012
New Revision: 31558
URL: https://nixos.org/websvn/nix/?rev=31558sc=1
Log:
kscreensaver depends on libXt and needs pkg-config at build time
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix Sat Jan
14 18:04:00 2012(r31557)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix Sat Jan
14 18:04:03 2012(r31558)
@@ -1,7 +1,9 @@
-{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2 }:
+{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt,
pkgconfig }:
kde {
- buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 ];
+ buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ];
+
+ buildNativeInputs = [ pkgconfig ];
preConfigure = cp -v ${./FindXscreensaver.cmake}
cmake/modules/FindXscreensaver.cmake;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31559 - nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork
Author: urkud
Date: Sat Jan 14 18:04:07 2012
New Revision: 31559
URL: https://nixos.org/websvn/nix/?rev=31559sc=1
Log:
kget depends on sqlite
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/kget.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/kget.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/kget.nix Sat Jan 14
18:04:03 2012(r31558)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/kget.nix Sat Jan 14
18:04:07 2012(r31559)
@@ -1,10 +1,10 @@
-{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs,
- shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }:
+{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, sqlite
+, shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }:
kde {
buildInputs =
[ kdelibs libktorrent kde_workspace shared_desktop_ontologies kdepimlibs
- kde_baseapps gpgme boost libmms qca2
+ kde_baseapps gpgme boost libmms qca2 sqlite
];
KDEDIRS = libktorrent;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31562 - nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork
Author: urkud
Date: Sat Jan 14 18:04:18 2012
New Revision: 31562
URL: https://nixos.org/websvn/nix/?rev=31562sc=1
Log:
kopete: depend on sqlite, fix FindJasper
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
Added: nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake Sat Jan
14 18:04:18 2012(r31562)
@@ -0,0 +1,35 @@
+# - Try to find the Jasper JPEG2000 library
+# Once done this will define
+#
+# JASPER_FOUND - system has Jasper
+# JASPER_INCLUDE_DIR - the Jasper include directory
+# JASPER_LIBRARIES - The libraries needed to use Jasper
+
+#=
+# Copyright 2006-2009 Kitware, Inc.
+# Copyright 2006 Alexander Neundorf neund...@kde.org
+#
+# Distributed under the OSI-approved BSD License (the License);
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=
+# (To distribute this file outside of CMake, substitute the full
+# License text for the above reference.)
+
+FIND_PACKAGE(JPEG)
+
+FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h)
+
+FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper)
+
+SET(JASPER_LIBRARIES ${JASPER_LIBRARY})
+
+# handle the QUIETLY and REQUIRED arguments and set JASPER_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper DEFAULT_MSG JASPER_LIBRARIES
JASPER_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARY)
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix Sat Jan 14
18:04:14 2012(r31561)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix Sat Jan 14
18:04:18 2012(r31562)
@@ -1,17 +1,21 @@
{ kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
jasper, libidn, mediastreamer, msilbc, pkgconfig, libxml2, libxslt, giflib,
- libgadu, boost, qca2, gpgme }:
+ libgadu, boost, qca2, gpgme, sqlite }:
kde {
buildInputs = [ kdelibs speex libmsn libotr kdepimlibs qimageblitz
libktorrent
jasper libidn mediastreamer msilbc libxml2 libxslt giflib libgadu boost
qca2
-gpgme ];
+gpgme sqlite ];
buildNativeInputs = [ pkgconfig ];
KDEDIRS = libktorrent;
- patchPhase = cp -v ${./FindmsiLBC.cmake}
kopete/cmake/modules/FindmsiLBC.cmake;
+ patchPhase =
+''
+ cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake
+ cp -v ${./FindJasper.cmake} kopete/cmake/modules/FindJasper.cmake
+'';
cmakeFlags = [ -DBUILD_skypebuttons=TRUE ];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31563 - nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork
Author: urkud
Date: Sat Jan 14 18:04:21 2012
New Revision: 31563
URL: https://nixos.org/websvn/nix/?rev=31563sc=1
Log:
kde48.krdc depends on libjpeg
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix
==
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix Sat Jan 14
18:04:18 2012(r31562)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix Sat Jan 14
18:04:21 2012(r31563)
@@ -1,7 +1,7 @@
-{ kde, kdelibs, libvncserver }:
+{ kde, kdelibs, libvncserver, libjpeg }:
kde {
- buildInputs = [ kdelibs libvncserver ];
+ buildInputs = [ kdelibs libvncserver libjpeg ];
patches = [ ./kdenetwork.patch ];
}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31564 - nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeedu
Author: urkud
Date: Sat Jan 14 18:04:25 2012
New Revision: 31564
URL: https://nixos.org/websvn/nix/?rev=31564sc=1
Log:
Fix kalzium build
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch
Deleted:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeedu/FindLibfacile.cmake
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeedu/kalzium-feature-log.patch
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix
Added: nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch
Sat Jan 14 18:04:25 2012(r31564)
@@ -0,0 +1,88 @@
+diff --git a/cmake/modules/FindLibfacile.cmake
b/cmake/modules/FindLibfacile.cmake
+index bef726e..043c65f 100644
+--- a/cmake/modules/FindLibfacile.cmake
b/cmake/modules/FindLibfacile.cmake
+@@ -4,7 +4,6 @@
+ # LIBFACILE_FOUND - system has Libfacile
+ # LIBFACILE_INCLUDE_DIR - the Libfacile include directory
+ # LIBFACILE_LIBRARIES - Link these to use Libfacile
+-# LIBFACILE_DEFINITIONS - Compiler switches required for using Libfacile
+ #
+ # Copyright (c) 2006, Carsten Niehaus, cnieh...@gmx.de
+ # Copyright (c) 2006, Montel Laurent, mon...@kde.org
+@@ -14,35 +13,20 @@
+
+ find_package(OCaml)
+
+-set(LIBFACILE_FOUND FALSE)
+-
+ if( OCAML_FOUND )
+- find_file(LIBFACILE_LIBRARIES NAMES facile.a
+- PATHS
+- ${OCAMLC_DIR}/facile/
++ find_library(LIBFACILE_LIBRARIES NAMES facile.a
++ HINTS ${OCAMLC_DIR}
++ PATH_SUFFIXES facile ocaml/facile
+)
+- #message(STATUS LIBFACILE_LIBRARIES :${LIBFACILE_LIBRARIES})
+- find_path(LIBFACILE_INCLUDE_DIR NAMES facile.a
+- PATHS
+- ${OCAMLC_DIR}/
+- PATH_SUFFIXES facile
++ find_path(LIBFACILE_INCLUDE_DIR NAMES facile.cmi
++ HINTS ${OCAMLC_DIR}
++ PATH_SUFFIXES facile lib/ocaml/facile
+)
+- #message(STATUS LIBFACILE_INCLUDE_DIR ${LIBFACILE_INCLUDE_DIR})
+- if(LIBFACILE_INCLUDE_DIR AND LIBFACILE_LIBRARIES)
+- set(LIBFACILE_FOUND TRUE)
+- endif(LIBFACILE_INCLUDE_DIR AND LIBFACILE_LIBRARIES)
+ endif(OCAML_FOUND)
+
+-
+-if(LIBFACILE_FOUND)
+- if(NOT Libfacile_FIND_QUIETLY)
+- message(STATUS Found Libfacile: ${LIBFACILE_LIBRARIES})
+- endif(NOT Libfacile_FIND_QUIETLY)
+-else(LIBFACILE_FOUND)
+- if(Libfacile_FIND_REQUIRED)
+- message(FATAL_ERROR Could not find Libfacile)
+- endif(Libfacile_FIND_REQUIRED)
+-endif(LIBFACILE_FOUND)
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(Libfacile DEFAULT_MSG LIBFACILE_INCLUDE_DIR
++ LIBFACILE_LIBRARIES OCAML_FOUND)
+
+ # show the LIBFACILE_INCLUDE_DIR and LIBFACILE_LIBRARIES variables only in
the advanced view
+ mark_as_advanced(LIBFACILE_INCLUDE_DIR LIBFACILE_LIBRARIES )
+diff --git a/src/CMakeOCamlInstructions.cmake
b/src/CMakeOCamlInstructions.cmake
+index 40b6755..de89253 100644
+--- a/src/CMakeOCamlInstructions.cmake
b/src/CMakeOCamlInstructions.cmake
+@@ -2,7 +2,7 @@ link_directories (${OCAMLC_DIR})
+
+ macro(OCAML_MLI_TO_CMI _cmi _mli)
+add_custom_command(OUTPUT ${_cmi}
+- COMMAND ${OCAML_OCAMLC_EXECUTABLE} ARGS -o ${_cmi} -I
+facile -c ${_mli}
++ COMMAND ${OCAML_OCAMLC_EXECUTABLE} ARGS -o ${_cmi} -I
${LIBFACILE_INCLUDE_DIR} -c ${_mli}
+ DEPENDS ${_mli} ${ARGN}
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${_cmi})
+@@ -10,7 +10,7 @@ endmacro(OCAML_MLI_TO_CMI)
+
+ macro(OCAML_ML_TO_CMX _cmx _ml)
+add_custom_command(OUTPUT ${_cmx}
+- COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} ARGS -o ${_cmx} -I
+facile -c ${_ml}
++ COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} ARGS -o ${_cmx} -I
${LIBFACILE_INCLUDE_DIR} -c ${_ml}
+DEPENDS ${_ml} ${ARGN}
+WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${_cmx})
+@@ -58,7 +58,7 @@ ocaml_ml_to_cmx(${CMAKE_CURRENT_BINARY_DIR}/lexer.cmx
${CMAKE_CURRENT_SOURCE_DIR
+ # object files
+
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
+- COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I +facile -c
${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c -o
${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
++ COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I
${LIBFACILE_INCLUDE_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c -o
${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
+DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c
${CMAKE_CURRENT_BINARY_DIR}/solver.o
+WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
[Nix-commits] SVN commit: nix - r31565 - nixpkgs/trunk/pkgs/development/libraries/cairo
Author: urkud Date: Sat Jan 14 18:04:28 2012 New Revision: 31565 URL: https://nixos.org/websvn/nix/?rev=31565sc=1 Log: cairo: propagate more dependencies Modified: nixpkgs/trunk/pkgs/development/libraries/cairo/default.nix Modified: nixpkgs/trunk/pkgs/development/libraries/cairo/default.nix == --- nixpkgs/trunk/pkgs/development/libraries/cairo/default.nix Sat Jan 14 18:04:25 2012(r31564) +++ nixpkgs/trunk/pkgs/development/libraries/cairo/default.nix Sat Jan 14 18:04:28 2012(r31565) @@ -21,15 +21,15 @@ }; buildInputs = -[ pkgconfig x11 fontconfig pixman xlibs.libXrender ] +[ pkgconfig x11 fontconfig xlibs.libXrender ] ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] -++ stdenv.lib.optional gobjectSupport glib # On non-GNU systems we need GNU Gettext for libintl. ++ stdenv.lib.optional (!stdenv.isLinux) gettext; propagatedBuildInputs = -[ freetype ] ++ +[ freetype pixman ] ++ +stdenv.lib.optional gobjectSupport glib ++ stdenv.lib.optional postscriptSupport zlib ++ stdenv.lib.optional pngSupport libpng; ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r31566 - nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies
Author: urkud
Date: Sat Jan 14 18:04:34 2012
New Revision: 31566
URL: https://nixos.org/websvn/nix/?rev=31566sc=1
Log:
SDO: add meta.homepage
Modified:
nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies/default.nix
Modified: nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies/default.nix
==
--- nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies/default.nix Sat Jan
14 18:04:28 2012(r31565)
+++ nixpkgs/trunk/pkgs/data/misc/shared-desktop-ontologies/default.nix Sat Jan
14 18:04:34 2012(r31566)
@@ -11,6 +11,7 @@
buildInputs = [ cmake ];
meta = with stdenv.lib; {
+homepage = http://oscaf.sourceforge.net/;
description = Ontologies necessary for the Nepomuk semantic desktop;
longDescription = ''
The shared-desktop-ontologies package brings the semantic web to the
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
