From 501884ff7da8caaebc718638da0b66d157613fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 12 Oct 2021 19:58:04 +0200 Subject: [PATCH 1/7] xboxdrv: minor cleanup --- pkgs/misc/drivers/xboxdrv/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index 7031f7941305..72c342e7b6a9 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -10,12 +10,9 @@ , dbus-glib }: -let - version = "0.8.8"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xboxdrv"; - inherit version; + version = "0.8.8"; src = fetchFromGitHub { owner = "xboxdrv"; @@ -36,5 +33,4 @@ stdenv.mkDerivation { maintainers = [ ]; platforms = platforms.linux; }; - } From f1ed3ba54c6e3630776d041ccd84c5b1bb444ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 12 Oct 2021 19:58:29 +0200 Subject: [PATCH 2/7] ccze: move autoconf to nativeBuildInputs --- pkgs/tools/misc/ccze/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ccze/default.nix b/pkgs/tools/misc/ccze/default.nix index 874653c7f6c3..4946fd64d89d 100644 --- a/pkgs/tools/misc/ccze/default.nix +++ b/pkgs/tools/misc/ccze/default.nix @@ -11,9 +11,14 @@ stdenv.mkDerivation rec { hash = "sha256-LVwmbrq78mZcAEuAqjXTqLE5we83H9mcMPtxQx2Tn/c="; }; - buildInputs = [ autoconf ncurses pcre ]; + nativeBuildInputs = [ autoconf ]; - preConfigure = "autoheader && autoconf "; + buildInputs = [ ncurses pcre ]; + + preConfigure = '' + autoheader + autoconf + ''; meta = with lib; { description = "Fast, modular log colorizer"; From f8d3ae5d0a4706825fcdfe57af3ee49e9e2fe93c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 12 Oct 2021 19:58:41 +0200 Subject: [PATCH 3/7] contacts: remove extra lib --- pkgs/tools/misc/contacts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index e0b1613735f8..08ba484f51ee 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { homepage = "http://www.gnufoo.org/contacts/contacts.html"; license = licenses.gpl2; maintainers = with maintainers; [ jwiegley ]; - platforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.darwin; + platforms = platforms.darwin; + hydraPlatforms = platforms.darwin; }; } From 45ae719fb53aa0a41d21f0c12ea85ca1e37f5d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 12 Oct 2021 19:58:49 +0200 Subject: [PATCH 4/7] profile-sync-daemon: remove preferLocalBuild --- pkgs/tools/misc/profile-sync-daemon/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index c14d3b07a37c..4cca88a9b40a 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { --replace "sudo " "/run/wrappers/bin/sudo " ''; - preferLocalBuild = true; - meta = with lib; { description = "Syncs browser profile dirs to RAM"; longDescription = '' From 1d864209168ce8a0ad306f41d79cbfd797b8af7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 12 Oct 2021 20:00:29 +0200 Subject: [PATCH 5/7] sdate: move autoreconfHook to nativeBuildInputs, minor cleanups --- pkgs/tools/misc/sdate/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/sdate/default.nix b/pkgs/tools/misc/sdate/default.nix index 899d3259b261..abc046bb6d02 100644 --- a/pkgs/tools/misc/sdate/default.nix +++ b/pkgs/tools/misc/sdate/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook }: + stdenv.mkDerivation rec { pname = "sdate"; version = "0.7"; @@ -10,13 +11,13 @@ stdenv.mkDerivation rec { hash = "sha256-jkwe+bSBa0p1Xzfetsdpw0RYw/gSRxnY2jBOzC5HtJ8="; }; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; - meta = { + meta = with lib; { homepage = "https://www.df7cb.de/projects/sdate"; description = "Eternal september version of the date program"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ edef ]; - platforms = lib.platforms.all; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ edef ]; + platforms = platforms.all; }; } From 9bd158f4617d619ec4017df1926c7a6b75126f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 12 Oct 2021 20:00:46 +0200 Subject: [PATCH 6/7] txt2man: minor cleanups, don't overwrite patchPhase, use makeFlags directly --- pkgs/tools/misc/txt2man/default.nix | 30 ++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index b522665e34fa..a6ebcb288216 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -11,19 +11,19 @@ stdenv.mkDerivation rec { hash = "sha256-Aqi5PNNaaM/tr9A/7vKeafYKYIs/kHbwHzE7+R/9r9s="; }; - preConfigure = '' - makeFlags=prefix="$out" - ''; + makeFlags = [ + "prefix=${placeholder "out"}" + ]; - patchPhase = '' + postPatch = '' for f in bookman src2man txt2man; do - substituteInPlace $f --replace "gawk" "${gawk}/bin/gawk" - - substituteInPlace $f --replace "(date" "(${coreutils}/bin/date" - substituteInPlace $f --replace "=cat" "=${coreutils}/bin/cat" - substituteInPlace $f --replace "cat <<" "${coreutils}/bin/cat <<" - substituteInPlace $f --replace "expand" "${coreutils}/bin/expand" - substituteInPlace $f --replace "(uname" "(${coreutils}/bin/uname" + substituteInPlace $f \ + --replace "gawk" "${gawk}/bin/gawk" \ + --replace "(date" "(${coreutils}/bin/date" \ + --replace "=cat" "=${coreutils}/bin/cat" \ + --replace "cat <<" "${coreutils}/bin/cat <<" \ + --replace "expand" "${coreutils}/bin/expand" \ + --replace "(uname" "(${coreutils}/bin/uname" done ''; @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { sh -c 'unset PATH; printf hello | ./txt2man' ''; - meta = { + meta = with lib; { description = "Convert flat ASCII text to man page format"; homepage = "http://mvertes.free.fr/"; - license = lib.licenses.gpl2; - platforms = with lib.platforms; linux ++ darwin; - maintainers = with lib.maintainers; [ bjornfor ]; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor ]; }; } From 24cd85e2c6c440d045e23c7c223406faf7019f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 12 Oct 2021 20:01:25 +0200 Subject: [PATCH 7/7] xtitle: minor cleanup --- pkgs/tools/misc/xtitle/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix index 975b24103d59..e3454538bf84 100644 --- a/pkgs/tools/misc/xtitle/default.nix +++ b/pkgs/tools/misc/xtitle/default.nix @@ -11,15 +11,17 @@ stdenv.mkDerivation rec { hash = "sha256-SVfM2vCCacgchXj0c0sPk3VR6DUI4R0ofFnxJSY4oDg="; }; + postPatch = '' + sed -i "s|/usr/local|$out|" Makefile + ''; + buildInputs = [ libxcb git xcbutil xcbutilwm ]; - prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; - - meta = { + meta = with lib; { description = "Outputs X window titles"; homepage = "https://github.com/baskerville/xtitle"; - maintainers = [ lib.maintainers.meisternu ]; + maintainers = with maintainers; [ meisternu ]; license = "Custom"; - platforms = lib.platforms.linux; + platforms = platforms.linux; }; }