cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #270687 from bobby285271/fix/xfce4-ofborg-ping

Browse source 
xfce.mkXfcederivation: Fix ofborg maintainer ping
This commit is contained in:
Bobby Rong 2023-12-05 21:19:15 +08:00 committed by GitHub
commit 45b9d6a7c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/desktops/xfce/mkXfceDerivation.nix
View file

@ -9,6 +9,8 @@
, sha256 , sha256
, odd-unstable ? true , odd-unstable ? true
, patchlevel-unstable ? true , patchlevel-unstable ? true
, passthru ? { }
, meta ? { }
, ... , ...
} @ args: } @ args:
@ -22,9 +24,7 @@ let
concatAttrLists = attrsets: concatAttrLists = attrsets:
zipAttrsWithNames (filterAttrNames isList (head attrsets)) (_: concatLists) attrsets; zipAttrsWithNames (filterAttrNames isList (head attrsets)) (_: concatLists) attrsets;
template = rec { template = {
inherit pname version;
nativeBuildInputs = [ pkg-config xfce4-dev-tools wrapGAppsHook ]; nativeBuildInputs = [ pkg-config xfce4-dev-tools wrapGAppsHook ];
buildInputs = [ hicolor-icon-theme ]; buildInputs = [ hicolor-icon-theme ];
configureFlags = [ "--enable-maintainer-mode" ]; configureFlags = [ "--enable-maintainer-mode" ];
@ -41,19 +41,21 @@ let
pos = builtins.unsafeGetAttrPos "pname" args; pos = builtins.unsafeGetAttrPos "pname" args;
passthru.updateScript = gitUpdater { passthru = {
inherit rev-prefix odd-unstable patchlevel-unstable; updateScript = gitUpdater {
}; inherit rev-prefix odd-unstable patchlevel-unstable;
};
} // passthru;
meta = with lib; { meta = with lib; {
homepage = "https://gitlab.xfce.org/${category}/${pname}"; homepage = "https://gitlab.xfce.org/${category}/${pname}";
license = licenses.gpl2Plus; # some libraries are under LGPLv2+ license = licenses.gpl2Plus; # some libraries are under LGPLv2+
platforms = platforms.linux; platforms = platforms.linux;
}; } // meta;
}; };
publicArgs = removeAttrs args [ "category" "pname" "sha256" ]; publicArgs = removeAttrs args [ "category" "sha256" ];
in in
stdenv.mkDerivation (recursiveUpdate template publicArgs // concatAttrLists [ template args ]) stdenv.mkDerivation (publicArgs // template // concatAttrLists [ template args ])
# TODO [ AndersonTorres ]: verify if it allows using hash attribute as an option to sha256 # TODO [ AndersonTorres ]: verify if it allows using hash attribute as an option to sha256