treewide: use wafHook
Replace "waf" phases with wafHook that manages everything automatically. Should make things more modular. Packages affected here are: - a2jmidid - ams-lv2 - ardour - fomp - guitarix - ingen - jalv - mda-lv2 - non - patchage - hamster-time-tracker - kupfer - xiphos - xfce4-dockbarx-plugin - xfce4-namebar-plugin - dropbox - clasp - aubio - liliv - lv2 - lvtk - ntk - raul - sratom - suil - ganv - ndn-cxx - ns3 - serd - sord - termbox - wxmupen64plus - jackaudio - pflask - blockhash - glmark2 - weighttp
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
{ stdenv, pkgconfig, fetchFromGitHub, python2, bash, vala, dockbarx, gtk2, xfce, pythonPackages }:
|
||||
{ stdenv, pkgconfig, fetchFromGitHub, python2, bash, vala
|
||||
, dockbarx, gtk2, xfce, pythonPackages, wafHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
ver = "0.5";
|
||||
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
pythonPath = [ dockbarx ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig wafHook ];
|
||||
buildInputs = [ python2 vala gtk2 pythonPackages.wrapPython ]
|
||||
++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ])
|
||||
++ pythonPath;
|
||||
@@ -25,12 +26,6 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace src/dockbarx.vala --replace '/usr/bin/env python2' ${bash}/bin/bash
|
||||
'';
|
||||
|
||||
configurePhase = "python waf configure --prefix=$out";
|
||||
|
||||
buildPhase = "python waf build";
|
||||
|
||||
installPhase = "python waf install";
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn "$out/share/xfce4/panel/plugins" "$out $pythonPath"
|
||||
'';
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ stdenv, pkgconfig, fetchFromGitHub, python2, vala, gtk2, libwnck, libxfce4util, xfce4-panel }:
|
||||
{ stdenv, pkgconfig, fetchFromGitHub, python2, vala
|
||||
, gtk2, libwnck, libxfce4util, xfce4-panel, wafHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
ver = "0.3.1";
|
||||
@@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1sl4qmjywfvv53ch7hyfysjfd91zl38y7gdw2y3k69vkzd3h18ad";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig wafHook ];
|
||||
buildInputs = [ python2 vala gtk2 libwnck libxfce4util xfce4-panel ];
|
||||
|
||||
postPatch = ''
|
||||
@@ -20,12 +21,6 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace src/namebar.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }"
|
||||
'';
|
||||
|
||||
configurePhase = "python waf configure --prefix=$out";
|
||||
|
||||
buildPhase = "python waf build";
|
||||
|
||||
installPhase = "python waf install";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/TiZ-EX1/xfce4-namebar-plugin;
|
||||
description = "A plugins which integrates titlebar and window controls into the xfce4-panel";
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ stdenv, fetchurl, pkgconfig
|
||||
, gtk
|
||||
, thunar-bare, python2, hicolor-icon-theme
|
||||
, wafHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -14,20 +15,12 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "08vhzzzwshyz371yl7fzfylmhvchhv3s5kml3dva4v39jhvrpnkf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig wafHook ];
|
||||
buildInputs = [
|
||||
gtk
|
||||
thunar-bare python2 hicolor-icon-theme
|
||||
];
|
||||
|
||||
configurePhase = "python2 waf configure --prefix=$out";
|
||||
|
||||
buildPhase = "python2 waf";
|
||||
|
||||
installPhase = ''
|
||||
python2 waf install
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
Reference in New Issue
Block a user