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.

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

[20.09] sawfish: fix build by replacing gdk-pixbuf with gdk-pixbuf-xlib #99537

Merged
merged 1 commit into from Oct 4, 2020

Conversation

@mdevlamynck
Copy link
Contributor

@mdevlamynck mdevlamynck commented Oct 4, 2020

Motivation for this change

backport of #99483
ZHF: #97479
(cherry picked from commit 5dba52e)
@NixOS/nixos-release-managers

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
(cherry picked from commit 5dba52e)
@risicle
Copy link
Contributor

@risicle risicle commented Oct 4, 2020

Builds happily, non-nixos linux x86_64

@risicle
risicle approved these changes Oct 4, 2020
@davidak
davidak approved these changes Oct 4, 2020
Copy link
Member

@davidak davidak left a comment

builds sucessfully on nixos 20.03. i don't know how i'm supposed to use it, but i guess this is fine?

[nix-shell:~/.cache/nixpkgs-review/pr-99537]$ sawfish
A window manager is already running but --replace was not given.

[nix-shell:~/.cache/nixpkgs-review/pr-99537]$ which sawfish
/nix/store/lx5rj0z80dn3vwvy904h34w6cfg7xp2j-sawfish-1.12.90/bin/sawfish

[nix-shell:~/.cache/nixpkgs-review/pr-99537]$ ls /nix/store/lx5rj0z80dn3vwvy904h34w6cfg7xp2j-sawfish-1.12.90/bin/
sawfish  sawfish-about  sawfish-client  sawfish-config  sawfish-kde4-session  sawfish-kde5-session  sawfish-lumina-session  sawfish-mate-session  sawfish-xfce-session

[nix-shell:~/.cache/nixpkgs-review/pr-99537]$ sawfish-about
/nix/store/lx5rj0z80dn3vwvy904h34w6cfg7xp2j-sawfish-1.12.90/bin/.sawfish-about-wrapped: line 2: exec: rep: not found

[nix-shell:~/.cache/nixpkgs-review/pr-99537]$ sawfish-client
/nix/store/lx5rj0z80dn3vwvy904h34w6cfg7xp2j-sawfish-1.12.90/bin/.sawfish-client-wrapped: line 2: exec: rep: not found

[nix-shell:~/.cache/nixpkgs-review/pr-99537]$ sawfish-config
/nix/store/lx5rj0z80dn3vwvy904h34w6cfg7xp2j-sawfish-1.12.90/bin/.sawfish-config-wrapped: line 8: exec: rep: not found

[nix-shell:~/.cache/nixpkgs-review/pr-99537]$ sawfish-xfce-session
A window manager is already running but --replace was not given.
/nix/store/lx5rj0z80dn3vwvy904h34w6cfg7xp2j-sawfish-1.12.90/bin/sawfish-xfce-session: line 11: exec: startxfce4: not found

[nix-shell:~/.cache/nixpkgs-review/pr-99537]$ sawfish-mate-session
A window manager is already running but --replace was not given.
/nix/store/lx5rj0z80dn3vwvy904h34w6cfg7xp2j-sawfish-1.12.90/bin/sawfish-mate-session: line 11: exec: mate-session: not found
@AndersonTorres
Copy link
Member

@AndersonTorres AndersonTorres commented Oct 4, 2020

@davidak I usually use services.xserver.sawfish.enable option on configuration.nix file.

On the other hand I didn't test naked X11 yet.

@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Oct 4, 2020

I just have to say I've never seen a fandom wiki used for an opensource project homepage https://sawfish.fandom.com/wiki/Main_Page 😁

@worldofpeace worldofpeace merged commit b5ba701 into NixOS:release-20.09 Oct 4, 2020
18 checks passed
18 checks passed
action
Details
sawfish, sawfish.passthru.tests on aarch64-linux No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="424805d"; rev="424805d8c06529ab41939ea0c3526e51ccffee7e"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="424805d"; rev="424805d8c06529ab41939ea0c3526e51ccffee7e"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="424805d"; rev="424805d8c06529ab41939ea0c3526e51ccffee7e"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="424805d"; rev="424805d8c06529ab41939ea0c3526e51ccffee7e"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="424805d"; rev="424805d8c06529ab41939ea0c3526e51ccffee7e"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="424805d"; rev="424805d8c06529ab41939ea0c3526e51ccffee7e"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="424805d"; rev="424805d8c06529ab41939ea0c3526e51ccffee7e"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
sawfish, sawfish.passthru.tests on x86_64-linux Success
Details
@AndersonTorres
Copy link
Member

@AndersonTorres AndersonTorres commented Oct 5, 2020

@worldofpeace they didn't like the old SourceForge page :P

@mdevlamynck mdevlamynck deleted the mdevlamynck:backport branch Oct 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.