Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 882324e3a786
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d5b02278c644
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 19, 2017

  1. screenfetch: fix darwin execution 

    Fixes #31790
    @matthewbauer
    matthewbauer committed Nov 19, 2017
    Copy the full SHA
    1137928 View commit details

Commits on Nov 20, 2017

  1. Merge pull request #31814 from matthewbauer/screenfetch-darwin 

    screenfetch: fix darwin execution
    @LnL7
    LnL7 authored Nov 20, 2017
    Copy the full SHA
    d5b0227 View commit details
Showing with 19 additions and 9 deletions.
  1. +19 −9 pkgs/tools/misc/screenfetch/default.nix
28 changes: 19 additions & 9 deletions pkgs/tools/misc/screenfetch/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper, coreutils, gawk, procps, gnused
{ stdenv, lib, fetchFromGitHub, makeWrapper, coreutils, gawk, procps, gnused
, bc, findutils, xdpyinfo, xprop, gnugrep, ncurses
, darwin
}:

stdenv.mkDerivation {
@@ -21,13 +22,22 @@ stdenv.mkDerivation {
# Fix all of the depedencies of screenfetch
patchShebangs $out/bin/screenfetch
wrapProgram "$out/bin/screenfetch" \
--set PATH ${stdenv.lib.makeBinPath [
coreutils gawk procps gnused findutils xdpyinfo
xprop gnugrep ncurses bc
]}
--set PATH ${lib.makeBinPath ([
coreutils gawk gnused findutils
gnugrep ncurses bc
] ++ lib.optionals stdenv.isLinux [
procps
xdpyinfo
xprop
] ++ lib.optionals stdenv.isDarwin (with darwin; [
adv_cmds
DarwinTools
system_cmds
"/usr" # some commands like defaults is not available to us
]))}
'';

meta = {
meta = with lib; {
description = "Fetches system/theme information in terminal for Linux desktop screenshots";
longDescription = ''
screenFetch is a "Bash Screenshot Information Tool". This handy Bash
@@ -39,9 +49,9 @@ stdenv.mkDerivation {
screenshot upon displaying info, and even customizing the screenshot
command! This script is very easy to add to and can easily be extended.
'';
license = stdenv.lib.licenses.gpl3;
license = licenses.gpl3;
homepage = http://git.silverirc.com/cgit.cgi/screenfetch-dev.git/;
maintainers = with stdenv.lib.maintainers; [relrod];
platforms = stdenv.lib.platforms.all;
maintainers = with maintainers; [relrod];
platforms = platforms.all;
};
}