colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #205247 from abathur/zenity_loosen_platform

Browse Source
This commit is contained in:
Sandro 2022-12-11 19:19:51 +01:00 committed by GitHub
commit 7c66c793fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/graphics/tev/default.nix
View File

@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
platforms = platforms.unix;
badPlatforms = [ "aarch64-linux" ]; # fails on Hydra since forever
broken = stdenv.isDarwin; # needs apple frameworks + SDK fix? see #205247
maintainers = with maintainers; [ ];
};
}

2
pkgs/desktops/gnome/core/zenity/default.nix
View File

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Tool to display dialogs from the commandline and shell scripts";
homepage = "https://wiki.gnome.org/Projects/Zenity";
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = teams.gnome.members;
};
}

6
pkgs/development/lua-modules/nfd/default.nix
View File

@ -1,5 +1,5 @@
{ fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib
, substituteAll, zenity }:
{ stdenv, fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib
, substituteAll, zenity, AppKit }:
buildLuarocksPackage {
pname = "nfd";
@ -25,6 +25,8 @@ buildLuarocksPackage {
extraVariables.LUA_LIBDIR = "${lua}/lib";
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optionals stdenv.isDarwin [ AppKit ];
fixupPhase = ''
find $out -name nfd_zenity.so -execdir mv {} nfd.so \;
'';

1
pkgs/top-level/lua-packages.nix
View File

@ -95,6 +95,7 @@ in
nfd = callPackage ../development/lua-modules/nfd {
inherit (pkgs.gnome) zenity;
inherit (pkgs.darwin.apple_sdk.frameworks) AppKit;
};
vicious = (callPackage ({ fetchFromGitHub }: stdenv.mkDerivation rec {