Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2d2e503d2a57
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0de5c4afd9f5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 15, 2017

  1. enlightenment: fix names of setuid wrapped files

    @romildo
    romildo committed Nov 15, 2017
    Copy the full SHA
    22c85de View commit details

Commits on Nov 16, 2017

  1. Merge pull request #31693 from romildo/fix.enlightenment 

    enlightenment: fix names of setuid wrapped files
    @orivej
    orivej authored Nov 16, 2017
    Copy the full SHA
    0de5c4a View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/desktops/enlightenment/enlightenment.suid-exes.patch
4 changes: 2 additions & 2 deletions pkgs/desktops/enlightenment/enlightenment.suid-exes.patch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- enlightenment-0.22.0.orig/meson/meson_inst.sh 2017-09-25 10:55:43.000000000 -0300
+++ enlightenment-0.22.0/meson/meson_inst.sh 2017-11-12 09:04:33.356050746 -0200
+++ enlightenment-0.22.0/meson/meson_inst.sh 2017-11-15 08:31:03.336844920 -0200
@@ -1,6 +1,19 @@
-#!/bin/sh
+#!/bin/sh -x
@@ -18,7 +18,7 @@
+ b=$(basename "$f".orig)
+ mv -v "$f"{,.orig}
+ ln -sv /run/wrappers/bin/"$b" "$f"
+ echo " \"$b\".source = \"$f\";" >> $w
+ echo " \"$b\".source = \"$f.orig\";" >> $w
done
+
+echo " };" >> $w