aland/nixpkgs-odroid-hc4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

Browse source 
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 • committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

47
pkgs/applications/window-managers/xmonad/log-applet/default.nix Normal file
View file

@ -0,0 +1,47 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib
, desktopSupport ? "gnomeflashback", xorg
, gtk2
, gtk3, gnome, mate
, libxfce4util, xfce4-panel
}:
assert desktopSupport == "gnomeflashback" || desktopSupport == "mate" || desktopSupport == "xfce4";
stdenv.mkDerivation rec {
version = "unstable-2017-09-15";
pname = "xmonad-log-applet";
name = "${pname}-${desktopSupport}-${version}";
src = fetchFromGitHub {
owner = "kalj";
repo = pname;
rev = "a1b294cad2f266e4f18d9de34167fa96a0ffdba8";
sha256 = "042307grf4zvn61gnflhsj5xsjykrk9sjjsprprm4iij0qpybxcw";
};
buildInputs = [ glib dbus-glib xorg.xcbutilwm ]
++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome.gnome-panel ]
++ lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ]
++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ]
;
nativeBuildInputs = [ autoreconfHook pkg-config ];
configureFlags = [ "--with-panel=${desktopSupport}" ];
patches = [ ./fix-paths.patch ];
# Setup hook replaces ${prefix} in pc files so we cannot use
# --define-variable=prefix=$prefix
PKG_CONFIG_LIBXFCE4PANEL_1_0_LIBDIR = "$(out)/lib";
meta = with lib; {
homepage = "https://github.com/kalj/xmonad-log-applet";
license = licenses.bsd3;
broken = desktopSupport == "gnomeflashback" || desktopSupport == "xfce4";
description = "An applet that will display XMonad log information (${desktopSupport} version)";
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
};
}

57
pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch Normal file
View file

@ -0,0 +1,57 @@
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
PKG_CHECK_MODULES(XCB, xcb xcb-ewmh)
PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.80)
-SESSION_BUS_SERVICES_DIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
+SESSION_BUS_SERVICES_DIR=$prefix/share/dbus-1/services
AC_SUBST([SESSION_BUS_SERVICES_DIR])
AC_ARG_WITH(
@@ -32,35 +32,35 @@
AS_IF(
[test "x$panel" = xgnome2],
[PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-3.0 >= 2.32.0)]
- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/share/gnome-panel/applets
- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/libexec
+ LIBPANEL_APPLET_DIR=$prefix/share/gnome-panel/applets
+ PLUGIN_DIR=$prefix/libexec
[AC_DEFINE(PANEL_GNOME, 1, [panel type])]
[AC_DEFINE(PANEL_GNOME2, 1, [panel type])]
,
[test "x$panel" = xgnome3],
[PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-4.0 >= 3.0.0)]
- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0`
- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-4.0`/libexec
+ LIBPANEL_APPLET_DIR=`$PKG_CONFIG --define-variable=prefix=$prefix --variable=libpanel_applet_dir libpanelapplet-4.0`
+ PLUGIN_DIR=$prefix/libexec
[AC_DEFINE(PANEL_GNOME, 1, [panel type])]
[AC_DEFINE(PANEL_GNOME3, 1, [panel type])]
,
[test "x$panel" = xgnomeflashback],
[PKG_CHECK_MODULES(LIBPANEL, libpanel-applet >= 3.0.0)]
- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanel-applet`
- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanel-applet`/libexec
+ LIBPANEL_APPLET_DIR=`$PKG_CONFIG --define-variable=prefix=$prefix --variable=libpanel_applet_dir libpanel-applet`
+ PLUGIN_DIR=$prefix/libexec
[AC_DEFINE(PANEL_GNOME, 1, [panel type])]
[AC_DEFINE(PANEL_GNOMEFLASHBACK, 1, [panel type])]
,
[test "x$panel" = xmate],
[PKG_CHECK_MODULES(LIBPANEL, libmatepanelapplet-4.0 >= 1.4.0)]
- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-4.0`/share/mate-panel/applets
- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-4.0`/libexec
+ LIBPANEL_APPLET_DIR=$prefix/share/mate-panel/applets
+ PLUGIN_DIR=$prefix/libexec
[AC_DEFINE(PANEL_MATE, 1, [panel type])]
,
[test "x$panel" = xxfce4],
[PKG_CHECK_MODULES(LIBPANEL, libxfce4panel-1.0 >= 4.6.0)]
- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libxfce4panel-1.0`/share/xfce4/panel-plugins
- PLUGIN_DIR=`$PKG_CONFIG --variable=libdir libxfce4panel-1.0`/xfce4/panel/plugins
+ LIBPANEL_APPLET_DIR=$prefix/share/xfce4/panel-plugins
+ PLUGIN_DIR=`$PKG_CONFIG --define-variable=prefix=$prefix --variable=libdir libxfce4panel-1.0`/xfce4/panel/plugins
[AC_DEFINE(PANEL_XFCE4, 1, [panel type])]
,
[AC_MSG_ERROR([Unknown panel type, use gnome2, gnome3, gnomeflashback, mate or xfce4])]

21
pkgs/applications/window-managers/xmonad/wrapper.nix Normal file
View file

@ -0,0 +1,21 @@
{ stdenv, ghcWithPackages, xmessage, makeWrapper, packages }:
let
xmonadEnv = ghcWithPackages (self: [ self.xmonad ] ++ packages self);
in stdenv.mkDerivation {
pname = "xmonad-with-packages";
inherit (xmonadEnv) version;
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
install -D ${xmonadEnv}/share/man/man1/xmonad.1.gz $out/share/man/man1/xmonad.1.gz
makeWrapper ${xmonadEnv}/bin/xmonad $out/bin/xmonad \
--set NIX_GHC "${xmonadEnv}/bin/ghc" \
--set XMONAD_XMESSAGE "${xmessage}/bin/xmessage"
'';
# trivial derivation
preferLocalBuild = true;
allowSubstitutes = false;
}