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

deadpixi-sam: fix on Darwin, bump #34035

Merged
merged 2 commits into from Jan 20, 2018
Merged

deadpixi-sam: fix on Darwin, bump #34035

merged 2 commits into from Jan 20, 2018

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented Jan 19, 2018

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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.

@veprbl
Copy link
Member Author

veprbl commented Jan 19, 2018

@GrahamcOfBorg build deadpixi-sam

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux


  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100  302k  100  302k    0     0   302k      0  0:00:01 --:--:--  0:00:01  638k

fetching path ‘/nix/store/bavh2b3w029jq537rj4db66c28j32kp1-deadpixi-sam-unstable-2016-10-08’...

*** Downloading ‘https://cache.nixos.org/nar/06whsfk2inaqiqkg1ifm1bk2is50s85fxjyhw8m074zm72amb3cx.nar.xz’ (signed by ‘cache.nixos.org-1’) to ‘/nix/store/bavh2b3w029jq537rj4db66c28j32kp1-deadpixi-sam-unstable-2016-10-08’...
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100  108k  100  108k    0     0   108k      0  0:00:01 --:--:--  0:00:01  334k

/nix/store/bavh2b3w029jq537rj4db66c28j32kp1-deadpixi-sam-unstable-2016-10-08

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: aarch64-linux

copying path '/nix/store/ppf6mxb8s1p6wa2392l6rsx96a0dy2ps-libxcb-1.12' from 'https://cache.nixos.org'...
copying path '/nix/store/b0kx23bjnfivf9qnj7npas40b09valc9-libSM-1.2.2' from 'https://cache.nixos.org'...
copying path '/nix/store/5spjvaawy41f8c466cxdxvn6ws1scg5x-freetype-2.7.1' from 'https://cache.nixos.org'...
copying path '/nix/store/arpkcavgqrrgw2lzbc7dibv4skxf3i71-fontconfig-2.12.1-lib' from 'https://cache.nixos.org'...
copying path '/nix/store/asfad1zwrhdwiigq3ni1yfqfxsiwwwmq-libX11-1.6.5' from 'https://cache.nixos.org'...
copying path '/nix/store/k3ckrw4xflfjrf13wc0gz4rljmyw36i0-libXrender-0.9.10' from 'https://cache.nixos.org'...
copying path '/nix/store/l2samjixia4s6cp3hchjxcdnbh5a6pvj-libXt-1.1.5' from 'https://cache.nixos.org'...
copying path '/nix/store/2hmrh3z4q6xy5nf818jnpq7cy4a6gbdr-libXft-2.3.2' from 'https://cache.nixos.org'...
copying path '/nix/store/5mzibrvdwv1hfdyfzzrfmvzzdap9x875-deadpixi-sam-unstable-2016-10-08' from 'https://cache.nixos.org'...
/nix/store/5mzibrvdwv1hfdyfzzrfmvzzdap9x875-deadpixi-sam-unstable-2016-10-08

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-darwin

make[1]: Entering directory '/private/tmp/nix-build-deadpixi-sam-unstable-2016-10-08.drv-0/source/rsam'
cp rsam /nix/store/8b1nzmp057zk5wd438akhyrihrsc7apc-deadpixi-sam-unstable-2016-10-08/bin
make[1]: Leaving directory '/private/tmp/nix-build-deadpixi-sam-unstable-2016-10-08.drv-0/source/rsam'
post-installation fixup
gzipping man pages under /nix/store/8b1nzmp057zk5wd438akhyrihrsc7apc-deadpixi-sam-unstable-2016-10-08/share/man/
strip is /nix/store/i1zz228nl3bljcbb83fq0rq7lr7nvv4y-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/8b1nzmp057zk5wd438akhyrihrsc7apc-deadpixi-sam-unstable-2016-10-08/bin
patching script interpreter paths in /nix/store/8b1nzmp057zk5wd438akhyrihrsc7apc-deadpixi-sam-unstable-2016-10-08
/nix/store/8b1nzmp057zk5wd438akhyrihrsc7apc-deadpixi-sam-unstable-2016-10-08/bin/B: interpreter directive changed from "/bin/sh" to "/nix/store/4cvvpbqdkrb0hr4p47q3s9l2a6k04y1g-bash-4.4-p12/bin/sh"
/nix/store/8b1nzmp057zk5wd438akhyrihrsc7apc-deadpixi-sam-unstable-2016-10-08

@veprbl
Copy link
Member Author

veprbl commented Jan 19, 2018

@GrahamcOfBorg build deadpixi-sam

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: aarch64-linux

shrinking RPATHs of ELF executables and libraries in /nix/store/z00rgysvnx1sc2hcaizfbw4lwfpdsr2l-deadpixi-sam-unstable-2017-10-27
shrinking /nix/store/z00rgysvnx1sc2hcaizfbw4lwfpdsr2l-deadpixi-sam-unstable-2017-10-27/bin/samterm
shrinking /nix/store/z00rgysvnx1sc2hcaizfbw4lwfpdsr2l-deadpixi-sam-unstable-2017-10-27/bin/B
shrinking /nix/store/z00rgysvnx1sc2hcaizfbw4lwfpdsr2l-deadpixi-sam-unstable-2017-10-27/bin/sam
gzipping man pages under /nix/store/z00rgysvnx1sc2hcaizfbw4lwfpdsr2l-deadpixi-sam-unstable-2017-10-27/share/man/
strip is /nix/store/jwz859pxqj7sl2dbwvmxkx68jp774izb-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/z00rgysvnx1sc2hcaizfbw4lwfpdsr2l-deadpixi-sam-unstable-2017-10-27/bin
patching script interpreter paths in /nix/store/z00rgysvnx1sc2hcaizfbw4lwfpdsr2l-deadpixi-sam-unstable-2017-10-27
checking for references to /build in /nix/store/z00rgysvnx1sc2hcaizfbw4lwfpdsr2l-deadpixi-sam-unstable-2017-10-27...
/nix/store/z00rgysvnx1sc2hcaizfbw4lwfpdsr2l-deadpixi-sam-unstable-2017-10-27

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-darwin

ln -sf "/nix/store/ak8m9b2qgxp2ndis4jj6gswcx1xcm93q-deadpixi-sam-unstable-2017-10-27/share/man//man1/sam.1" "/nix/store/ak8m9b2qgxp2ndis4jj6gswcx1xcm93q-deadpixi-sam-unstable-2017-10-27/share/man//man1/sam.save.1"
mkdir -p "/nix/store/ak8m9b2qgxp2ndis4jj6gswcx1xcm93q-deadpixi-sam-unstable-2017-10-27/share/man//man5"
cp samrc.5 "/nix/store/ak8m9b2qgxp2ndis4jj6gswcx1xcm93q-deadpixi-sam-unstable-2017-10-27/share/man//man5"
make[1]: Leaving directory '/private/tmp/nix-build-deadpixi-sam-unstable-2017-10-27.drv-0/source/doc'
post-installation fixup
gzipping man pages under /nix/store/ak8m9b2qgxp2ndis4jj6gswcx1xcm93q-deadpixi-sam-unstable-2017-10-27/share/man/
strip is /nix/store/i1zz228nl3bljcbb83fq0rq7lr7nvv4y-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/ak8m9b2qgxp2ndis4jj6gswcx1xcm93q-deadpixi-sam-unstable-2017-10-27/bin
patching script interpreter paths in /nix/store/ak8m9b2qgxp2ndis4jj6gswcx1xcm93q-deadpixi-sam-unstable-2017-10-27
/nix/store/ak8m9b2qgxp2ndis4jj6gswcx1xcm93q-deadpixi-sam-unstable-2017-10-27

@veprbl veprbl changed the title deadpixi-sam: fix on Darwin deadpixi-sam: fix on Darwin, bump Jan 19, 2018
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux

shrinking RPATHs of ELF executables and libraries in /nix/store/xq8mgd59whi8947gr05sl6abi865fyc6-deadpixi-sam-unstable-2017-10-27
shrinking /nix/store/xq8mgd59whi8947gr05sl6abi865fyc6-deadpixi-sam-unstable-2017-10-27/bin/sam
shrinking /nix/store/xq8mgd59whi8947gr05sl6abi865fyc6-deadpixi-sam-unstable-2017-10-27/bin/B
shrinking /nix/store/xq8mgd59whi8947gr05sl6abi865fyc6-deadpixi-sam-unstable-2017-10-27/bin/samterm
gzipping man pages under /nix/store/xq8mgd59whi8947gr05sl6abi865fyc6-deadpixi-sam-unstable-2017-10-27/share/man/
strip is /nix/store/mdyy001q67hiks0g24ra53z7ckm4jfr4-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/xq8mgd59whi8947gr05sl6abi865fyc6-deadpixi-sam-unstable-2017-10-27/bin 
patching script interpreter paths in /nix/store/xq8mgd59whi8947gr05sl6abi865fyc6-deadpixi-sam-unstable-2017-10-27
checking for references to /tmp/nix-build-deadpixi-sam-unstable-2017-10-27.drv-0 in /nix/store/xq8mgd59whi8947gr05sl6abi865fyc6-deadpixi-sam-unstable-2017-10-27...
/nix/store/xq8mgd59whi8947gr05sl6abi865fyc6-deadpixi-sam-unstable-2017-10-27


postPatch = ''
substituteInPlace config.mk.def \
--replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2"
'' + stdenv.lib.optionalString stdenv.cc.isClang ''
substituteInPlace config.mk.def \
--replace gcc clang
Copy link
Member

Choose a reason for hiding this comment

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

you can use cc or $CC here, that works in all platforms.

@veprbl
Copy link
Member Author

veprbl commented Jan 20, 2018

@GrahamcOfBorg build deadpixi-sam

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: aarch64-linux

shrinking RPATHs of ELF executables and libraries in /nix/store/zxzf8zk6zk9dmzl3mpm6ggh15dhp7bmk-deadpixi-sam-unstable-2017-10-27
shrinking /nix/store/zxzf8zk6zk9dmzl3mpm6ggh15dhp7bmk-deadpixi-sam-unstable-2017-10-27/bin/samterm
shrinking /nix/store/zxzf8zk6zk9dmzl3mpm6ggh15dhp7bmk-deadpixi-sam-unstable-2017-10-27/bin/B
shrinking /nix/store/zxzf8zk6zk9dmzl3mpm6ggh15dhp7bmk-deadpixi-sam-unstable-2017-10-27/bin/sam
gzipping man pages under /nix/store/zxzf8zk6zk9dmzl3mpm6ggh15dhp7bmk-deadpixi-sam-unstable-2017-10-27/share/man/
strip is /nix/store/jwz859pxqj7sl2dbwvmxkx68jp774izb-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/zxzf8zk6zk9dmzl3mpm6ggh15dhp7bmk-deadpixi-sam-unstable-2017-10-27/bin
patching script interpreter paths in /nix/store/zxzf8zk6zk9dmzl3mpm6ggh15dhp7bmk-deadpixi-sam-unstable-2017-10-27
checking for references to /build in /nix/store/zxzf8zk6zk9dmzl3mpm6ggh15dhp7bmk-deadpixi-sam-unstable-2017-10-27...
/nix/store/zxzf8zk6zk9dmzl3mpm6ggh15dhp7bmk-deadpixi-sam-unstable-2017-10-27

@veprbl veprbl force-pushed the samfix branch 2 times, most recently from c4dff96 to 2377157 Compare January 20, 2018 23:14
@LnL7 LnL7 merged commit e072086 into NixOS:master Jan 20, 2018
@veprbl veprbl deleted the samfix branch December 1, 2020 17:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants