diff options
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/ddccontrol/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/misc/dynamic-colors/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/misc/grc/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/misc/pipelight/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/profile-cleaner/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/misc/sharedown/default.nix | 14 |
6 files changed, 15 insertions, 13 deletions
diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 498ad0f09519..630b06bcfb3c 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , intltool , libxml2 @@ -34,6 +35,14 @@ stdenv.mkDerivation rec { ddccontrol-db ]; + patches = [ + # Upstream commit, fixed the version number in v1.0.0 + (fetchpatch { + url = "https://github.com/ddccontrol/ddccontrol/commit/fc8c5b5d0f2b64b08b95f4a7d8f47f2fd8ceec34.patch"; + hash = "sha256-SB1BaolTNCUYgj38nMg1uLUqOHvnwCr8T3cnfu/7rjI="; + }) + ]; + configureFlags = [ "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" ]; diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix index 9e8619459852..0c04f70f26f3 100644 --- a/pkgs/tools/misc/dynamic-colors/default.nix +++ b/pkgs/tools/misc/dynamic-colors/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; + mainProgram = "dynamic-colors"; }; } diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index 19e926c5caf6..e8f4282fb193 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -48,5 +48,6 @@ buildPythonApplication rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ azahi lovek323 AndersonTorres peterhoeg ]; platforms = platforms.unix; + mainProgram = "grc"; }; } diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index cdf77b0af427..e6ec23266d2c 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { homepage = "http://pipelight.net/"; license = with lib.licenses; [ mpl11 gpl2 lgpl21 ]; description = "A wrapper for using Windows plugins in Linux browsers"; - maintainers = with lib.maintainers; [ skeidel ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index a33199efa7da..8e5d8325d059 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.all; maintainers = [ lib.maintainers.devhell ]; + mainProgram = "profile-cleaner"; }; } diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index 47e97fa25520..0f93551965e2 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -6,7 +6,7 @@ , libsecret , python3 , pkg-config -, nodejs +, nodePackages , electron , makeWrapper , makeDesktopItem @@ -63,6 +63,7 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ python3 pkg-config + nodePackages.node-gyp ]; buildInputs = [ libsecret @@ -75,17 +76,6 @@ stdenvNoCC.mkDerivation rec { }; }; - preBuild = '' - # Set up headers for node-gyp, which is needed to build keytar. - mkdir -p "$HOME/.cache/node-gyp/${nodejs.version}" - - # Set up version which node-gyp checks in <https://github.com/nodejs/node-gyp/blob/4937722cf597ccd1953628f3d5e2ab5204280051/lib/install.js#L87-L96> against the version in <https://github.com/nodejs/node-gyp/blob/4937722cf597ccd1953628f3d5e2ab5204280051/package.json#L15>. - echo 9 > "$HOME/.cache/node-gyp/${nodejs.version}/installVersion" - - # Link node headers so that node-gyp does not try to download them. - ln -sfv "${nodejs}/include" "$HOME/.cache/node-gyp/${nodejs.version}" - ''; - packageJSON = "${src}/package.json"; yarnLock = ./yarn.lock; |