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

Merge pull request #41732 from Infinisil/overrideDerivation 

some overrideDerivation cleanups
This commit is contained in:
Matthew Justin Bauer 2018-06-22 20:07:48 -04:00 committed by GitHub
parent 2624f90796 02f11bca60
commit a006243b8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/window-managers/i3/gaps.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, i3, autoreconfHook }: { fetchurl, stdenv, i3, autoreconfHook }:
i3.overrideDerivation (super : rec { i3.overrideAttrs (oldAttrs : rec {
name = "i3-gaps-${version}"; name = "i3-gaps-${version}";
version = "4.15.0.1"; version = "4.15.0.1";
@ -11,7 +11,7 @@ i3.overrideDerivation (super : rec {
sha256 = "16s6bink8yj3zix4vww64b745d5drf2vqjg8vz3pwzrark09hfal"; sha256 = "16s6bink8yj3zix4vww64b745d5drf2vqjg8vz3pwzrark09hfal";
}; };
nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ]; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];
postUnpack = '' postUnpack = ''
echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION
@ -19,7 +19,6 @@ i3.overrideDerivation (super : rec {
# fatal error: GENERATED_config_enums.h: No such file or directory # fatal error: GENERATED_config_enums.h: No such file or directory
enableParallelBuilding = false; enableParallelBuilding = false;
}) // {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A fork of the i3 tiling window manager with some additional features"; description = "A fork of the i3 tiling window manager with some additional features";
@ -36,5 +35,4 @@ i3.overrideDerivation (super : rec {
Configured via plain text file. Multi-monitor. UTF-8 clean. Configured via plain text file. Multi-monitor. UTF-8 clean.
''; '';
}; };
})
}

12
pkgs/development/interpreters/luajit/default.nix
View File

@ -7,10 +7,8 @@ rec {
version = "2.0.5"; version = "2.0.5";
isStable = true; isStable = true;
sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
} // { meta = genericMeta // {
# 64-bit ARM isn't supported upstream platforms = lib.filter (p: p != "aarch64-linux") genericMeta.platforms;
meta = meta // {
platforms = lib.filter (p: p != "aarch64-linux") meta.platforms;
}; };
}; };
@ -20,13 +18,12 @@ rec {
sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs"; sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs";
}; };
genericMeta = with stdenv.lib; {
meta = with stdenv.lib; {
description = "High-performance JIT compiler for Lua 5.1"; description = "High-performance JIT compiler for Lua 5.1";
homepage = http://luajit.org; homepage = http://luajit.org;
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers ; [ thoughtpolice smironov vcunat andir ]; maintainers = with maintainers; [ thoughtpolice smironov vcunat andir ];
}; };
generic = generic =
@ -37,6 +34,7 @@ rec {
url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; url = "http://luajit.org/download/LuaJIT-${version}.tar.gz";
inherit sha256; inherit sha256;
}) })
, meta ? genericMeta
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

5
pkgs/development/libraries/libcollectdclient/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, collectd }: { stdenv, fetchurl, collectd }:
with stdenv.lib; with stdenv.lib;
overrideDerivation collectd (oldAttrs: { collectd.overrideAttrs (oldAttrs: {
name = "libcollectdclient-${collectd.version}"; name = "libcollectdclient-${collectd.version}";
buildInputs = [ ]; buildInputs = [ ];
@ -16,7 +16,6 @@ overrideDerivation collectd (oldAttrs: {
postInstall = "rm -rf $out/{bin,etc,sbin,share}"; postInstall = "rm -rf $out/{bin,etc,sbin,share}";
}) // {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "C Library for collectd, a daemon which collects system performance statistics periodically"; description = "C Library for collectd, a daemon which collects system performance statistics periodically";
homepage = http://collectd.org; homepage = http://collectd.org;
@ -24,4 +23,4 @@ overrideDerivation collectd (oldAttrs: {
platforms = platforms.linux; # TODO: collectd may be linux but the C client may be more portable? platforms = platforms.linux; # TODO: collectd may be linux but the C client may be more portable?
maintainers = [ maintainers.sheenobu maintainers.bjornfor ]; maintainers = [ maintainers.sheenobu maintainers.bjornfor ];
}; };
} })

9
pkgs/servers/x11/xorg/xwayland.nix
View File

@ -1,9 +1,8 @@
{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }: { stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }:
with stdenv.lib; with stdenv.lib;
overrideDerivation xorgserver (oldAttrs: { xorgserver.overrideAttrs (oldAttrs: {
name = "xwayland-${xorgserver.version}"; name = "xwayland-${xorgserver.version}";
propagatedBuildInputs = oldAttrs.propagatedBuildInputs propagatedBuildInputs = oldAttrs.propagatedBuildInputs
@ -28,14 +27,10 @@ overrideDerivation xorgserver (oldAttrs: {
rm -fr $out/share/X11/xkb/compiled rm -fr $out/share/X11/xkb/compiled
''; '';
}) // {
meta = { meta = {
description = "An X server for interfacing X11 apps with the Wayland protocol"; description = "An X server for interfacing X11 apps with the Wayland protocol";
homepage = http://wayland.freedesktop.org/xserver.html; homepage = http://wayland.freedesktop.org/xserver.html;
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} })