Skip to content
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

Jump to bottom

dwm-status: add xsetroot and alsaUtils as runtime deps #41815

Merged
merged 1 commit into from Jun 12, 2018
Merged

dwm-status: add xsetroot and alsaUtils as runtime deps #41815

merged 1 commit into from Jun 12, 2018

Conversation

Gerschtli
Copy link
Contributor

Motivation for this change

Adds xorg.xsetroot and optional alsaUtils as runtime dependencies.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@Gerschtli
Copy link
Contributor Author

@andir cc

andir
andir requested changes Jun 11, 2018
View reviewed changes
pkgs/applications/window-managers/dwm/dwm-status.nix Outdated

let
runtimeDeps = [ xorg.xsetroot ]
++ lib.optional (alsaUtils != null) alsaUtils;
Copy link
Member

Choose a reason for hiding this comment

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

As you can see in the ofborg failure you are missing an import to the lib attributeset:

undefined variable 'lib' at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-0-gleber.ewr1.nix.ci/pkgs/applications/window-managers/dwm/dwm-status.nix:5:8

pkgs/applications/window-managers/dwm/dwm-status.nix Outdated
@@ -15,11 +20,17 @@ rustPlatform.buildRustPackage rec {
dbus
gdk_pixbuf
libnotify
makeWrapper
pkgconfig
Copy link
Member

Choose a reason for hiding this comment

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

while we are at it lets move pkgconfig to nativeBuildInputs, also makeWrapper should be a nativeBuildInput.

pkgs/applications/window-managers/dwm/dwm-status.nix Outdated
pkgconfig
];

cargoSha256 = "0169k91pb7ipvi0m71cmkppp1klgp5ghampa7x0fxkyrvrf0dvqg";

postInstall = ''
wrapProgram $out/bin/${name} \
Copy link
Member

Choose a reason for hiding this comment

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

Is ${name} really the right thing to do here?

Is the binary called dwm-status-0.4.0 or is it called dwm-status?

@Gerschtli
Copy link
Contributor Author

I'm sorry.. It is a bit late for me, should go to sleep now :D

@andir
Copy link
Member

andir commented Jun 12, 2018

@GrahamcOfBorg build dwm-status

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: dwm-status

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: dwm-status

Partial log (click to expand)

installing
glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/gifi87jz219cc4vvbn9rb8x7655gxrzm-dwm-status-0.4.0
shrinking /nix/store/gifi87jz219cc4vvbn9rb8x7655gxrzm-dwm-status-0.4.0/bin/.dwm-status-wrapped
strip is /nix/store/21ymadblbmsbb2bk4q7gl4kjasp8zmgd-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/gifi87jz219cc4vvbn9rb8x7655gxrzm-dwm-status-0.4.0/bin
patching script interpreter paths in /nix/store/gifi87jz219cc4vvbn9rb8x7655gxrzm-dwm-status-0.4.0
checking for references to /build in /nix/store/gifi87jz219cc4vvbn9rb8x7655gxrzm-dwm-status-0.4.0...
/nix/store/gifi87jz219cc4vvbn9rb8x7655gxrzm-dwm-status-0.4.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: dwm-status

Partial log (click to expand)

installing
glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/3zfmddkr3bnqrl1kmn8hfl71fsa0zpw4-dwm-status-0.4.0
shrinking /nix/store/3zfmddkr3bnqrl1kmn8hfl71fsa0zpw4-dwm-status-0.4.0/bin/.dwm-status-wrapped
strip is /nix/store/qg2agrqkf240s656d207zqhipl0bc2id-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/3zfmddkr3bnqrl1kmn8hfl71fsa0zpw4-dwm-status-0.4.0/bin
patching script interpreter paths in /nix/store/3zfmddkr3bnqrl1kmn8hfl71fsa0zpw4-dwm-status-0.4.0
checking for references to /build in /nix/store/3zfmddkr3bnqrl1kmn8hfl71fsa0zpw4-dwm-status-0.4.0...
/nix/store/3zfmddkr3bnqrl1kmn8hfl71fsa0zpw4-dwm-status-0.4.0

@andir andir merged commit a964d29 into NixOS:master Jun 12, 2018
@Gerschtli Gerschtli deleted the fix/dwm-status branch June 13, 2018 23:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andir andir andir approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Gerschtli @andir @GrahamcOfBorg