Add some dev outputs
This commit is contained in:
parent
b0280f598e
commit
60aaced9a0
|
@ -14,4 +14,5 @@ mkDerivation {
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
dolphin kdelibs4support ki18n kio kxmlgui
|
dolphin kdelibs4support ki18n kio kxmlgui
|
||||||
];
|
];
|
||||||
|
outputs = [ "out" "dev" ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,4 +14,5 @@ mkDerivation {
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
kio kparts kxmlgui qtscript solid
|
kio kparts kxmlgui qtscript solid
|
||||||
];
|
];
|
||||||
|
outputs = [ "out" "dev" ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,4 +19,5 @@ mkDerivation {
|
||||||
kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
|
kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
|
||||||
kwidgetsaddons kitemviews kio kwindowsystem plasma-framework qtdeclarative
|
kwidgetsaddons kitemviews kio kwindowsystem plasma-framework qtdeclarative
|
||||||
];
|
];
|
||||||
|
outputs = [ "out" "dev" ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,4 +11,5 @@ mkDerivation {
|
||||||
kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes
|
kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes
|
||||||
knotifications kwindowsystem polkit-qt
|
knotifications kwindowsystem polkit-qt
|
||||||
];
|
];
|
||||||
|
outputs = [ "out" "dev" ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -101,4 +101,6 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
outputs = [ "out" "dev" ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -103,4 +103,6 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
outputs = [ "out" "dev" ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
|
||||||
"--without-selinux"
|
"--without-selinux"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas
|
gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas
|
||||||
polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring
|
polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring
|
||||||
|
|
|
@ -1,10 +1,6 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib } :
|
{ stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib } :
|
||||||
|
|
||||||
let
|
assert (openssl != null) == (gnutls == null);
|
||||||
xor = a: b: (a || b) && (!(a && b));
|
|
||||||
in
|
|
||||||
|
|
||||||
assert xor (openssl != null) (gnutls != null);
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "openconnect-7.08";
|
name = "openconnect-7.08";
|
||||||
|
@ -16,6 +12,8 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "00wacb79l2c45f94gxs63b9z25wlciarasvjrb8jb8566wgyqi0w";
|
sha256 = "00wacb79l2c45f94gxs63b9z25wlciarasvjrb8jb8566wgyqi0w";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
export PKG_CONFIG=${pkgconfig}/bin/pkg-config
|
export PKG_CONFIG=${pkgconfig}/bin/pkg-config
|
||||||
export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2"
|
export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2"
|
||||||
|
|
Loading…
Reference in New Issue