diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-07 01:41:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-07 01:41:48 -0400 |
commit | 6d0c554cbb36bbfda786fb2e4b12239af91781cb (patch) | |
tree | 940a40cef637750b36536a422a91c91020fe045d /nix/default.nix | |
parent | 9b0627617ab35daf34f051352f3a6f05898ca935 (diff) | |
parent | 6d984739458511f444e80f06f6a12dd400268372 (diff) | |
download | podman-6d0c554cbb36bbfda786fb2e4b12239af91781cb.tar.gz podman-6d0c554cbb36bbfda786fb2e4b12239af91781cb.tar.bz2 podman-6d0c554cbb36bbfda786fb2e4b12239af91781cb.zip |
Merge pull request #9934 from alvistack/master-linux-amd64
Update nix pin with `make nixpkgs`
Diffstat (limited to 'nix/default.nix')
-rw-r--r-- | nix/default.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/nix/default.nix b/nix/default.nix index 7745d8b50..aae520c9e 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -7,7 +7,7 @@ let libassuan = (static pkg.libassuan); libgpgerror = (static pkg.libgpgerror); libseccomp = (static pkg.libseccomp); - glib = (static pkg.glib).overrideAttrs(x: { + glib = (static pkg.glib).overrideAttrs (x: { outputs = [ "bin" "out" "dev" ]; mesonFlags = [ "-Ddefault_library=static" @@ -15,14 +15,21 @@ let "-Dgtk_doc=false" "-Dnls=disabled" ]; + postInstall = '' + moveToOutput "share/glib-2.0" "$dev" + substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev" + sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" + sed '1i#line 1 "${x.pname}-${x.version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ + -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c + ''; }); }; }; }); - static = pkg: pkg.overrideAttrs(x: { + static = pkg: pkg.overrideAttrs (x: { doCheck = false; - configureFlags = (x.configureFlags or []) ++ [ + configureFlags = (x.configureFlags or [ ]) ++ [ "--without-shared" "--disable-shared" ]; @@ -56,4 +63,5 @@ let install -Dm755 bin/podman-remote $out/bin/podman-remote ''; }; -in self +in +self |