Skip to content

Commit

Permalink
Update nix pin with make nixpkgs
Browse files Browse the repository at this point in the history
Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
  • Loading branch information
hswong3i committed Dec 20, 2020
1 parent c704d3a commit 00b9fa1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -52,7 +52,7 @@ endif
# Update nix/nixpkgs.json its latest stable commit
.PHONY: nixpkgs
nixpkgs:
@nix run -f channel:nixos-20.03 nix-prefetch-git -c nix-prefetch-git \
@nix run -f channel:nixos-20.09 nix-prefetch-git -c nix-prefetch-git \
--no-deepClone https://github.com/nixos/nixpkgs > nix/nixpkgs.json

# Build statically linked binary
Expand Down
4 changes: 2 additions & 2 deletions nix/default.nix
Expand Up @@ -59,10 +59,10 @@ let
doCheck = false;
enableParallelBuilding = true;
outputs = [ "out" ];
nativeBuildInputs = [ bash git pcre pkg-config which ];
nativeBuildInputs = [ bash gitMinimal pcre pkg-config which ];
buildInputs = [ glibc glibc.static glib ];
prePatch = ''
export CFLAGS='-static'
export CFLAGS='-static -pthread'
export LDFLAGS='-s -w -static-libgcc -static'
export EXTRA_LDFLAGS='-s -w -linkmode external -extldflags "-static -lm"'
'';
Expand Down
11 changes: 7 additions & 4 deletions nix/nixpkgs.json
@@ -1,7 +1,10 @@
{
"url": "https://github.com/nixos/nixpkgs",
"rev": "6e089d30148953df7abb3a1167169afc7848499c",
"date": "2020-11-05T09:56:30+01:00",
"sha256": "0ydqjkz7payl16psx445jwh6dc6lgbvj2w11xin1dqvbpcp03jcy",
"fetchSubmodules": false
"rev": "6ea2fd15d881006b41ea5bbed0f76bffcd85f9f9",
"date": "2020-12-20T13:26:58+10:00",
"path": "/nix/store/kyw1ackbp9qh1jzlzwmjvi5i3541ym5z-nixpkgs",
"sha256": "0kgqmw4ki10b37530jh912sn49x3gay5cnmfr8yz2yp8nvkrk236",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}

0 comments on commit 00b9fa1

Please sign in to comment.