git.iko.soy/nix-bundle
on master help sign in
Fix with latest nixpkgs, use musl-native pkgs
commitbb7503fae6a63c8c54882234dbfb69b422d7cae4 authorWill Dietz <w@wdtz.org> dateMon 26 Feb 2018, 12:39 (9 years ago) parentdcbfa1a
2 files changed+13−9
compare with master
unifiedsplit
appdir.nix+3−3 appimage-top.nix+10−6
appdir.nix+3−3
@@ -1,13 +1,13 @@
1−{ stdenv, fetchurl, perl, pathsFromGraph, fetchFromGitHub, musl, coreutils, bash }:
1+{ stdenv, fetchurl, muslPkgs, perl, pathsFromGraph, fetchFromGitHub, coreutils, bash }:
22
33let
4− AppRun = targets: stdenv.mkDerivation {
4+ AppRun = targets: muslPkgs.stdenv.mkDerivation {
55 name = "AppRun";
66
77 phases = [ "buildPhase" "installPhase" "fixupPhase" ];
88
99 buildPhase = ''
10− CC="${musl}/bin/musl-gcc -O2 -Wall -Wno-deprecated-declarations -Wno-unused-result -static"
10+ CC="$CC -O2 -Wall -Wno-deprecated-declarations -Wno-unused-result -static"
1111 $CC ${./AppRun.c} -o AppRun -DENV_PATH='"${stdenv.lib.makeBinPath targets}"'
1212 '';
1313
appimage-top.nix+10−6
@@ -1,13 +1,17 @@
1−{nixpkgs ? import <nixpkgs> {}}:
1+{ nixpkgs' ? <nixpkgs> }:
22
3−with nixpkgs;
3+let
4+ pkgs = import nixpkgs' { };
5+ muslPkgs = import nixpkgs' {
6+ localSystem.config = "x86_64-unknown-linux-musl";
7+ };
48
5−rec {
6− appimagetool = callPackage ./appimagetool.nix {};
9+in rec {
10+ appimagetool = pkgs.callPackage ./appimagetool.nix {};
711
8− appimage = callPackage ./appimage.nix {
12+ appimage = pkgs.callPackage ./appimage.nix {
913 inherit appimagetool;
1014 };
1115
12− appdir = callPackage ./appdir.nix {};
16+ appdir = pkgs.callPackage ./appdir.nix { inherit muslPkgs; };
1317}