Skip to content

some overrideDerivation cleanups #41732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthewbauer merged 1 commit into from
Jun 23, 2018
Merged

some overrideDerivation cleanups #41732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions pkgs/applications/window-managers/i3/gaps.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, i3, autoreconfHook }:

i3.overrideDerivation (super : rec {
i3.overrideAttrs (oldAttrs : rec {

name = "i3-gaps-${version}";
version = "4.15.0.1";
Expand All @@ -11,15 +11,14 @@ i3.overrideDerivation (super : rec {
sha256 = "16s6bink8yj3zix4vww64b745d5drf2vqjg8vz3pwzrark09hfal";
};

nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ];
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];

postUnpack = ''
echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION
'';

# fatal error: GENERATED_config_enums.h: No such file or directory
enableParallelBuilding = false;
}) // {

meta = with stdenv.lib; {
Copy link
Member

@matthewbauer matthewbauer Jun 22, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think meta works with overrideAttrs. Can you confirm that the meta is still being applied? I thought you still had to do a union like with overrideDerivation.

Copy link
Member Author

@infinisil infinisil Jun 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does indeed work, the main reason I'm doing this PR is to have meta.position available. All other meta attributes work as well.

Copy link
Member

@matthewbauer matthewbauer Jun 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok looks good then.

description = "A fork of the i3 tiling window manager with some additional features";
Expand All @@ -36,5 +35,4 @@ i3.overrideDerivation (super : rec {
Configured via plain text file. Multi-monitor. UTF-8 clean.
'';
};

}
})
12 changes: 5 additions & 7 deletions pkgs/development/interpreters/luajit/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ rec {
version = "2.0.5";
isStable = true;
sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
} // {
# 64-bit ARM isn't supported upstream
meta = meta // {
platforms = lib.filter (p: p != "aarch64-linux") meta.platforms;
meta = genericMeta // {
platforms = lib.filter (p: p != "aarch64-linux") genericMeta.platforms;
};
};

Expand All @@ -20,13 +18,12 @@ rec {
sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs";
};


meta = with stdenv.lib; {
genericMeta = with stdenv.lib; {
description = "High-performance JIT compiler for Lua 5.1";
homepage = http://luajit.org;
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers ; [ thoughtpolice smironov vcunat andir ];
maintainers = with maintainers; [ thoughtpolice smironov vcunat andir ];
};

generic =
Expand All @@ -37,6 +34,7 @@ rec {
url = "http://luajit.org/download/LuaJIT-${version}.tar.gz";
inherit sha256;
})
, meta ? genericMeta
}:

stdenv.mkDerivation rec {
Expand Down
5 changes: 2 additions & 3 deletions pkgs/development/libraries/libcollectdclient/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, collectd }:
with stdenv.lib;

overrideDerivation collectd (oldAttrs: {
collectd.overrideAttrs (oldAttrs: {
name = "libcollectdclient-${collectd.version}";
buildInputs = [ ];

Expand All @@ -16,12 +16,11 @@ overrideDerivation collectd (oldAttrs: {

postInstall = "rm -rf $out/{bin,etc,sbin,share}";

}) // {
meta = with stdenv.lib; {
description = "C Library for collectd, a daemon which collects system performance statistics periodically";
homepage = http://collectd.org;
license = licenses.gpl2;
platforms = platforms.linux; # TODO: collectd may be linux but the C client may be more portable?
maintainers = [ maintainers.sheenobu maintainers.bjornfor ];
};
}
})
9 changes: 2 additions & 7 deletions pkgs/servers/x11/xorg/xwayland.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@

{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }:

with stdenv.lib;

overrideDerivation xorgserver (oldAttrs: {
xorgserver.overrideAttrs (oldAttrs: {

name = "xwayland-${xorgserver.version}";
propagatedBuildInputs = oldAttrs.propagatedBuildInputs
Expand All @@ -28,14 +27,10 @@ overrideDerivation xorgserver (oldAttrs: {
rm -fr $out/share/X11/xkb/compiled
'';

}) // {
meta = {
description = "An X server for interfacing X11 apps with the Wayland protocol";
homepage = http://wayland.freedesktop.org/xserver.html;
license = licenses.mit;
platforms = platforms.linux;
};
}



})