Merge pull request #205247 from abathur/zenity_loosen_platform
This commit is contained in:
commit
7c66c793fe
|
@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
badPlatforms = [ "aarch64-linux" ]; # fails on Hydra since forever
|
badPlatforms = [ "aarch64-linux" ]; # fails on Hydra since forever
|
||||||
|
broken = stdenv.isDarwin; # needs apple frameworks + SDK fix? see #205247
|
||||||
maintainers = with maintainers; [ ];
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Tool to display dialogs from the commandline and shell scripts";
|
description = "Tool to display dialogs from the commandline and shell scripts";
|
||||||
homepage = "https://wiki.gnome.org/Projects/Zenity";
|
homepage = "https://wiki.gnome.org/Projects/Zenity";
|
||||||
platforms = platforms.linux;
|
platforms = platforms.unix;
|
||||||
maintainers = teams.gnome.members;
|
maintainers = teams.gnome.members;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib
|
{ stdenv, fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib
|
||||||
, substituteAll, zenity }:
|
, substituteAll, zenity, AppKit }:
|
||||||
|
|
||||||
buildLuarocksPackage {
|
buildLuarocksPackage {
|
||||||
pname = "nfd";
|
pname = "nfd";
|
||||||
|
@ -25,6 +25,8 @@ buildLuarocksPackage {
|
||||||
extraVariables.LUA_LIBDIR = "${lua}/lib";
|
extraVariables.LUA_LIBDIR = "${lua}/lib";
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
buildInputs = lib.optionals stdenv.isDarwin [ AppKit ];
|
||||||
|
|
||||||
fixupPhase = ''
|
fixupPhase = ''
|
||||||
find $out -name nfd_zenity.so -execdir mv {} nfd.so \;
|
find $out -name nfd_zenity.so -execdir mv {} nfd.so \;
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -95,6 +95,7 @@ in
|
||||||
|
|
||||||
nfd = callPackage ../development/lua-modules/nfd {
|
nfd = callPackage ../development/lua-modules/nfd {
|
||||||
inherit (pkgs.gnome) zenity;
|
inherit (pkgs.gnome) zenity;
|
||||||
|
inherit (pkgs.darwin.apple_sdk.frameworks) AppKit;
|
||||||
};
|
};
|
||||||
|
|
||||||
vicious = (callPackage ({ fetchFromGitHub }: stdenv.mkDerivation rec {
|
vicious = (callPackage ({ fetchFromGitHub }: stdenv.mkDerivation rec {
|
||||||
|
|
Loading…
Reference in a new issue